Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ffi/ffi
...
head fork: rubinius/ffi
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
5 ext/ffi_c/FunctionInfo.c
@@ -74,7 +74,10 @@ fntype_mark(FunctionType* fnInfo)
rb_gc_mark(fnInfo->rbParameterTypes);
rb_gc_mark(fnInfo->rbEnums);
if (fnInfo->callbackCount > 0 && fnInfo->callbackParameters != NULL) {
- rb_gc_mark_locations(&fnInfo->callbackParameters[0], &fnInfo->callbackParameters[fnInfo->callbackCount]);
+ int i;
+ for (i = 0; i < fnInfo->callbackCount; ++i) {
+ rb_gc_mark(fnInfo->callbackParameters[i]);
+ }
}
}
View
5 ext/ffi_c/Struct.c
@@ -241,7 +241,10 @@ struct_mark(Struct *s)
rb_gc_mark(s->rbPointer);
rb_gc_mark(s->rbLayout);
if (s->rbReferences != NULL) {
- rb_gc_mark_locations(&s->rbReferences[0], &s->rbReferences[s->layout->referenceFieldCount]);
+ int i;
+ for (i = 0; i < s->layout->referenceFieldCount; ++i) {
+ rb_gc_mark(s->rbReferences[i]);
+ }
}
}
View
2  ext/ffi_c/extconf.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx"
require 'mkmf'
require 'rbconfig'
dir_config("ffi_c")

No commit comments for this range

Something went wrong with that request. Please try again.