diff options
| author | tduehr <td@matasano.com> | 2015-03-17 15:31:05 -0500 |
|---|---|---|
| committer | tduehr <td@matasano.com> | 2015-03-17 15:31:05 -0500 |
| commit | 549aa81763e3f8425fd85329babd2dc39d04dc6e (patch) | |
| tree | 91af3b79384093fc8a5e47adfbd2a7055c9d309d | |
| parent | d3b466af6a5b9f74f96e19cc5396b31144024f4c (diff) | |
| parent | fc5989a1cec956a2f8aecc1dade57fa6814b0d39 (diff) | |
| download | ffi-549aa81763e3f8425fd85329babd2dc39d04dc6e.tar.gz | |
Merge pull request #395 from lowjoel/master
Fix compatibility with newer libffi on Windows/MSVC
| -rw-r--r-- | ext/ffi_c/MethodHandle.c | 13 | ||||
| -rw-r--r-- | ext/ffi_c/StructLayout.c | 4 | ||||
| -rw-r--r-- | ext/ffi_c/extconf.rb | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ext/ffi_c/MethodHandle.c b/ext/ffi_c/MethodHandle.c index cee1df5..b60f9cc 100644 --- a/ext/ffi_c/MethodHandle.c +++ b/ext/ffi_c/MethodHandle.c @@ -132,12 +132,6 @@ rbffi_MethodHandle_CodeAddress(MethodHandle* handle) #ifndef CUSTOM_TRAMPOLINE static void attached_method_invoke(ffi_cif* cif, void* retval, METHOD_PARAMS parameters, void* user_data); -static ffi_type* methodHandleParamTypes[] = { - &ffi_type_sint, - &ffi_type_pointer, - &ffi_type_ulong, -}; - static ffi_cif mh_cif; static bool @@ -339,7 +333,12 @@ void rbffi_MethodHandle_Init(VALUE module) { #ifndef CUSTOM_TRAMPOLINE - ffi_status ffiStatus; + ffi_status ffiStatus; + ffi_type* methodHandleParamTypes[] = { + &ffi_type_sint, + &ffi_type_pointer, + &ffi_type_ulong, + }; #endif defaultClosurePool = rbffi_ClosurePool_New((int) trampoline_size(), prep_trampoline, NULL); diff --git a/ext/ffi_c/StructLayout.c b/ext/ffi_c/StructLayout.c index 8edc41e..483e532 100644 --- a/ext/ffi_c/StructLayout.c +++ b/ext/ffi_c/StructLayout.c @@ -510,8 +510,8 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align) static VALUE struct_layout_union_bang(VALUE self) { - static const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64, - &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL }; + const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64, + &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL }; StructLayout* layout; ffi_type *t = NULL; int count, i; diff --git a/ext/ffi_c/extconf.rb b/ext/ffi_c/extconf.rb index b4d75b5..180634f 100644 --- a/ext/ffi_c/extconf.rb +++ b/ext/ffi_c/extconf.rb @@ -33,10 +33,11 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx' $defs << "-DHAVE_EXTCONF_H" if $defs.empty? # needed so create_header works $defs << "-DUSE_INTERNAL_LIBFFI" unless libffi_ok $defs << "-DRUBY_1_9" if RUBY_VERSION >= "1.9.0" + $defs << "-DFFI_BUILDING" if RbConfig::CONFIG['host_os'] =~ /mswin/ # for compatibility with newer libffi create_header - $LOCAL_LIBS << " ./libffi/.libs/libffi_convenience.lib" if RbConfig::CONFIG['host_os'] =~ /mswin/ + $LOCAL_LIBS << " ./libffi/.libs/libffi_convenience.lib" if !libffi_ok && RbConfig::CONFIG['host_os'] =~ /mswin/ create_makefile("ffi_c") unless libffi_ok |