ruby-changes:42941
From: nobu <ko1@a...>
Date: Mon, 16 May 2016 13:29:06 +0900 (JST)
Subject: [ruby-changes:42941] nobu:r55015 (trunk): configure.in: revert macro names
nobu 2016-05-16 13:29:01 +0900 (Mon, 16 May 2016) New Revision: 55015 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55015 Log: configure.in: revert macro names * configure.in (FUNC_STDCALL, FUNC_CDECL, FUNC_FASTCALL): set macro names explicitly to the old names, which are accidentally changed at r54985, for backward compatibilities. fiddle also depends on these names to fallback to ANSI names. [ruby-core:75494] [Bug #12377] Modified files: trunk/ChangeLog trunk/configure.in trunk/test/fiddle/test_handle.rb Index: test/fiddle/test_handle.rb =================================================================== --- test/fiddle/test_handle.rb (revision 55014) +++ test/fiddle/test_handle.rb (revision 55015) @@ -182,5 +182,12 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_handle.rb#L182 def test_no_memory_leak assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Handle.allocate}; GC.start', rss: true) end + + if /cygwin|mingw|mswin/ =~ RUBY_PLATFORM + def test_fallback_to_ansi + k = Fiddle::Handle.new("kernel32.dll") + refute_nil(k["GetFileAttributes"]) + end + end end end if defined?(Fiddle) Index: configure.in =================================================================== --- configure.in (revision 55014) +++ configure.in (revision 55015) @@ -1815,9 +1815,9 @@ if test "$rb_cv_func_weak" != x; then https://github.com/ruby/ruby/blob/trunk/configure.in#L1815 fi if_i386=${universal_binary+[defined __i386__]} -RUBY_FUNC_ATTRIBUTE(__stdcall__, [], [], ${if_i386}) -RUBY_FUNC_ATTRIBUTE(__cdecl__, [], [], ${if_i386}) -RUBY_FUNC_ATTRIBUTE(__fastcall__, [], [], ${if_i386}) +RUBY_FUNC_ATTRIBUTE(__stdcall__, FUNC_STDCALL, rb_cv_func_stdcall, ${if_i386}) +RUBY_FUNC_ATTRIBUTE(__cdecl__, FUNC_CDECL, rb_cv_func_cdecl, ${if_i386}) +RUBY_FUNC_ATTRIBUTE(__fastcall__, FUNC_FASTCALL, rb_cv_func_fastcall, ${if_i386}) RUBY_FUNC_ATTRIBUTE(__optimize__("O0"), FUNC_UNOPTIMIZED, rb_cv_func_unoptimized) RUBY_FUNC_ATTRIBUTE(__optimize__("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized) Index: ChangeLog =================================================================== --- ChangeLog (revision 55014) +++ ChangeLog (revision 55015) @@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Mon May 16 13:28:59 2016 Nobuyoshi Nakada <nobu@r...> + + * configure.in (FUNC_STDCALL, FUNC_CDECL, FUNC_FASTCALL): set + macro names explicitly to the old names, which are accidentally + changed at r54985, for backward compatibilities. + fiddle also depends on these names to fallback to ANSI names. + [ruby-core:75494] [Bug #12377] + Mon May 16 11:39:02 2016 SHIBATA Hiroshi <hsbt@r...> * lib/xmlrpc.rb, lib/xmlrpc/*, test/xmlrpc: XMLRPC is bundled gem -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/