ruby-changes:26127
From: ngoto <ko1@a...>
Date: Tue, 4 Dec 2012 18:55:18 +0900 (JST)
Subject: [ruby-changes:26127] ngoto:r38184 (trunk): * test/ruby/memory_status.rb (Memory): use fiddle/types if available.
ngoto 2012-12-04 18:55:07 +0900 (Tue, 04 Dec 2012) New Revision: 38184 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38184 Log: * test/ruby/memory_status.rb (Memory): use fiddle/types if available. * test/ruby/memory_status.rb (Memory::Win32): :stdcall is needed on x86 WIN32. This commit partly reverts r38054. Modified files: trunk/ChangeLog trunk/test/ruby/memory_status.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 38183) +++ ChangeLog (revision 38184) @@ -1,3 +1,10 @@ +Tue Dec 4 18:21:04 2012 Naohisa Goto <ngotogenome@g...> + + * test/ruby/memory_status.rb (Memory): use fiddle/types if available. + + * test/ruby/memory_status.rb (Memory::Win32): :stdcall is needed on + x86 WIN32. This commit partly reverts r38054. + Tue Dec 4 18:05:58 2012 Naohisa Goto <ngotogenome@g...> * ext/fiddle/lib/fiddle/types.rb: copied from ext/dl/lib/dl/types.rb Index: test/ruby/memory_status.rb =================================================================== --- test/ruby/memory_status.rb (revision 38183) +++ test/ruby/memory_status.rb (revision 38184) @@ -20,7 +20,11 @@ rescue LoadError require 'dl/import' end - require 'dl/types' + begin + require 'fiddle/types' + rescue LoadError + require 'dl/types' + end module Win32 begin @@ -29,7 +33,11 @@ extend DL::Importer end dlload "kernel32.dll", "psapi.dll" - include DL::Win32Types + begin + include Fiddle::Win32Types + rescue NameError + include DL::Win32Types + end typealias "SIZE_T", "size_t" PROCESS_MEMORY_COUNTERS = struct [ @@ -47,8 +55,8 @@ typealias "PPROCESS_MEMORY_COUNTERS", "PROCESS_MEMORY_COUNTERS*" - extern "HANDLE GetCurrentProcess()" - extern "BOOL GetProcessMemoryInfo(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD)" + extern "HANDLE GetCurrentProcess(), :stdcall" + extern "BOOL GetProcessMemoryInfo(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD), :stdcall" module_function def memory_info -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/