diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-31 21:13:09 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-31 21:13:09 +0000 |
commit | 07308c4d30b8c5260e5366c8eed2abf054d86fe7 (patch) | |
tree | 0444881bba7151db3ff7e6776404cfc1643a8383 /test/ruby | |
parent | 88326272bc079cd0f47759e02e174f9ff1a73774 (diff) |
* ext/dl/*: remove DL as it is replaced by Fiddle.
[Feature #5458] Thanks to Jonan Scheffler <jonanscheffler@gmail.com>
for this patch
* test/dl/*: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r-- | test/ruby/memory_status.rb | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb index 5347e34cb6..6c6b3f8934 100644 --- a/test/ruby/memory_status.rb +++ b/test/ruby/memory_status.rb @@ -15,36 +15,13 @@ module Memory read_status {|k, v| keys << k; vals << v} when /mswin|mingw/ =~ RUBY_PLATFORM - begin - require 'fiddle/import' - rescue LoadError - $LOAD_PATH.unshift File.join(File.join(__dir__, '..'), 'lib') - require_relative 'envutil' - EnvUtil.suppress_warning do - require 'dl/import' - end - end - begin - require 'fiddle/types' - rescue LoadError - require_relative 'envutil' - EnvUtil.suppress_warning do - require 'dl/types' - end - end + require 'fiddle/import' + require 'fiddle/types' module Win32 - begin - extend Fiddle::Importer - rescue NameError - extend DL::Importer - end + extend Fiddle::Importer dlload "kernel32.dll", "psapi.dll" - begin - include Fiddle::Win32Types - rescue NameError - include DL::Win32Types - end + include Fiddle::Win32Types typealias "SIZE_T", "size_t" PROCESS_MEMORY_COUNTERS = struct [ |