[前][次][番号順一覧][スレッド一覧]

ruby-changes:25997

From: usa <ko1@a...>
Date: Fri, 30 Nov 2012 19:57:16 +0900 (JST)
Subject: [ruby-changes:25997] usa:r38054 (trunk): * test/ruby/memory_status.rb (Memory::Win32): use fiddle instead of dl,

usa	2012-11-30 19:57:06 +0900 (Fri, 30 Nov 2012)

  New Revision: 38054

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38054

  Log:
    * 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.)

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/memory_status.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38053)
+++ ChangeLog	(revision 38054)
@@ -1,3 +1,9 @@
+Fri Nov 30 19:55:17 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@c...>
 
 	* defs/default_gems: Add base directory column.
Index: test/ruby/memory_status.rb
===================================================================
--- test/ruby/memory_status.rb	(revision 38053)
+++ test/ruby/memory_status.rb	(revision 38054)
@@ -15,11 +15,11 @@
     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 @@
 
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]