diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 10:57:06 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 10:57:06 +0000 |
| commit | 77df72a64aa7a7f223bff8050cc43224694a680f (patch) | |
| tree | 99921b22e5ed3681da588cd4b1bc9c13a38ceaa5 /test | |
| parent | f807e1b80d4fd503f342d64a4343025e56247997 (diff) | |
| download | ruby-77df72a64aa7a7f223bff8050cc43224694a680f.tar.gz | |
* 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.)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/memory_status.rb | 8 |
1 files changed, 4 insertions, 4 deletions
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 |