diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-26 08:23:50 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-26 08:23:50 +0000 |
| commit | 35f8beefb68e978e21158bbc0c40556cc09690f1 (patch) | |
| tree | b0e08ba2aa523a4eb5c555d75188fd38cd9ddf00 /ext | |
| parent | 244260d60b526f47583ed9cfdac995d1b080b393 (diff) | |
merge revision(s) 49750: [Backport #10876]
* ext/win32/Win32API.rb (initialize): accept both a string and an array
for the arguments of the imported function.
reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/win32/lib/Win32API.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/win32/lib/Win32API.rb b/ext/win32/lib/Win32API.rb index 7cabd9f84a..71f1d30e01 100644 --- a/ext/win32/lib/Win32API.rb +++ b/ext/win32/lib/Win32API.rb @@ -15,7 +15,7 @@ class Win32API @func = Fiddle::Function.new( handle[func], - import.chars.map { |win_type| TYPEMAP[win_type.tr("VPpNnLlIi", "0SSI")] }, + @proto.chars.map { |win_type| TYPEMAP[win_type.tr("VPpNnLlIi", "0SSI")] }, TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype] ) |