diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/memory_status.rb | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Fri Nov 30 19:55:17 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/ruby/memory_status.rb (Memory::Win32): use fiddle instead of dl, + but I doubt fiddle is not compatible with dl. (if you are interested, + see the diff.) + Fri Nov 30 19:37:44 2012 Kouhei Sutou <kou@cozmixng.org> * defs/default_gems: Add base directory column. diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb index e391441036..a13f414697 100644 --- a/test/ruby/memory_status.rb +++ b/test/ruby/memory_status.rb @@ -15,11 +15,11 @@ module Memory read_status {|k, v| keys << k; vals << v} when /mswin|mingw/ =~ RUBY_PLATFORM - require 'dl/import' + require 'fiddle/import' require 'dl/types' module Win32 - extend DL::Importer + extend Fiddle::Importer dlload "kernel32.dll", "psapi.dll" include DL::Win32Types typealias "SIZE_T", "size_t" @@ -39,8 +39,8 @@ module Memory typealias "PPROCESS_MEMORY_COUNTERS", "PROCESS_MEMORY_COUNTERS*" - extern "HANDLE GetCurrentProcess()", :stdcall - extern "BOOL GetProcessMemoryInfo(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD)", :stdcall + extern "HANDLE GetCurrentProcess()" + extern "BOOL GetProcessMemoryInfo(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD)" module_function def memory_info |