ngoto	2012-12-01 00:57:21 +0900 (Sat, 01 Dec 2012)

  New Revision: 38073

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38073

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/ext/fiddle/extconf.rb
    trunk/ext/fiddle/function.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38072)
+++ ChangeLog	(revision 38073)
@@ -1,3 +1,9 @@
+Sat Dec  1 00:48:19 2012  Naohisa Goto  <ngotogenome@g...>
+
+	* 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]
+
 Sat Dec  1 00:08:55 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/rubygems/test_gem_installer.rb
Index: ext/fiddle/function.c
===================================================================
--- ext/fiddle/function.c	(revision 38072)
+++ ext/fiddle/function.c	(revision 38073)
@@ -194,7 +194,7 @@
      */
     rb_define_const(cFiddleFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
 
-#ifdef FFI_STDCALL
+#ifdef HAVE_CONST_FFI_STDCALL
     /*
      * Document-const: STDCALL
      *
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 38072)
+++ ext/fiddle/extconf.rb	(revision 38073)
@@ -33,6 +33,8 @@
   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|

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/