diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-09 07:20:53 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-09 07:20:53 +0000 |
| commit | b97d91dd4afe7861c8301776cae3b9e3e58e2556 (patch) | |
| tree | 12af6d1eff0c433c07761b5060cedf5e37e47853 /test | |
| parent | c65134a3278b918fe3daf0dbb147c85c7d89d416 (diff) | |
merge revision(s) 34504,34506,34507,34508:
* ext/dl/lib/types.rb: Win64 support.
* ext/fiddle/conversions.c (value_to_generic): src is not guranteed as
a Bignum if the type is LONG_LONG. it may be a Fixnum if the value
is small.
* ext/dl/lib/value.rb (DL::ValueUtil.{unsigned_value,signed_value}):
currenly pack/unpack does not accept "q!" and "Q!".
* test/ruby/memory_status.rb (Memory::Win32): 64bit support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/memory_status.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb index d0596ccd5e..f504c0a736 100644 --- a/test/ruby/memory_status.rb +++ b/test/ruby/memory_status.rb @@ -22,7 +22,11 @@ module Memory extend DL::Importer dlload "kernel32.dll", "psapi.dll" include DL::Win32Types - typealias "SIZE_T", "DWORD" + if [nil].pack('p').bytesize == 8 + typealias "SIZE_T", "DWORD64" + else + typealias "SIZE_T", "DWORD32" + end PROCESS_MEMORY_COUNTERS = struct [ "DWORD cb", |