diff options
| author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 15:57:21 +0000 |
|---|---|---|
| committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 15:57:21 +0000 |
| commit | 4bb1bfa0ed10a3a1e2ca04ada24d72e0227ebce7 (patch) | |
| tree | a095464605a426fe0190d7b7e8c048cf152ad12f /ext/fiddle | |
| parent | 7c1a19b641fadd5eef3d21d327935adbb1aef853 (diff) | |
| download | ruby-4bb1bfa0ed10a3a1e2ca04ada24d72e0227ebce7.tar.gz | |
* ext/fiddle/extconf.rb, ext/fiddle/function.c
(Fiddle::Function::STDCALL): FFI_STDCALL is not a macro, but an enumeration. [ruby-core:50398] [Bug #7483]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/fiddle')
| -rw-r--r-- | ext/fiddle/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/fiddle/function.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index 9b9803f65b..2cb9ae0ace 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -33,6 +33,8 @@ elsif have_header "windows.h" end end +have_const('FFI_STDCALL', 'ffi.h') || have_const('FFI_STDCALL', 'ffi/ffi.h') + config = File.read(RbConfig.expand(File.join($arch_hdrdir, "ruby/config.h"))) types = {"SIZE_T"=>"SSIZE_T", "PTRDIFF_T"=>nil, "INTPTR_T"=>nil} types.each do |type, signed| diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c index 4c4bc13abc..38012bfcbd 100644 --- a/ext/fiddle/function.c +++ b/ext/fiddle/function.c @@ -194,7 +194,7 @@ Init_fiddle_function(void) */ rb_define_const(cFiddleFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI)); -#ifdef FFI_STDCALL +#ifdef HAVE_CONST_FFI_STDCALL /* * Document-const: STDCALL * |