diff options
| -rw-r--r-- | ext/win32/lib/win32/importer.rb | 9 | ||||
| -rw-r--r-- | ext/win32/lib/win32/registry.rb | 6 | ||||
| -rw-r--r-- | ext/win32/lib/win32/sspi.rb | 4 |
3 files changed, 5 insertions, 14 deletions
diff --git a/ext/win32/lib/win32/importer.rb b/ext/win32/lib/win32/importer.rb deleted file mode 100644 index 2bef016c29..0000000000 --- a/ext/win32/lib/win32/importer.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: false -require 'fiddle/import' - -module Win32 -end - -Win32.module_eval do - Importer = Fiddle::Importer -end diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb index 451499b166..ffc2979179 100644 --- a/ext/win32/lib/win32/registry.rb +++ b/ext/win32/lib/win32/registry.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'win32/importer' +require 'fiddle/import' module Win32 @@ -169,7 +169,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr # class Error < ::StandardError module Kernel32 - extend Importer + extend Fiddle::Importer dlload "kernel32.dll" end FormatMessageW = Kernel32.extern "int FormatMessageW(int, void *, int, int, void *, int, void *)", :stdcall @@ -225,7 +225,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr # module API include Constants - extend Importer + extend Fiddle::Importer dlload "advapi32.dll" [ "long RegOpenKeyExW(void *, void *, long, long, void *)", diff --git a/ext/win32/lib/win32/sspi.rb b/ext/win32/lib/win32/sspi.rb index 56cfc93910..a73819f24e 100644 --- a/ext/win32/lib/win32/sspi.rb +++ b/ext/win32/lib/win32/sspi.rb @@ -11,7 +11,7 @@ # Ruby Distribution License or GNU General Public License. # -require 'win32/importer' +require 'fiddle/import' # Implements bindings to Win32 SSPI functions, focused on authentication to a proxy server over HTTP. module Win32 @@ -36,7 +36,7 @@ module Win32 # Win32 API Functions. Uses Win32API to bind methods to constants contained in class. module API - extend Importer + extend Fiddle::Importer dlload "secur32.dll" [ # Can be called with AcquireCredentialsHandleA.call() |