diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 09:20:22 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 09:20:22 +0000 |
| commit | 375d08ea17d01c14f77c0d069b99c352fdaa8e73 (patch) | |
| tree | a2e1889639dd730d0fa6edfabfaa2ddc33b0e63f /lib | |
| parent | 4481f3c5e8f245d4bf502fed85ef08d436229163 (diff) | |
merges r22690 from trunk into ruby_1_9_1.
--
* ext/dl/cfunc.c (rb_dlcfunc_call): fix for stdcall and missing
argument numbers. [ruby-core:22601]
* ext/dl/dl.h (DLSTACK_PROTO0_): added.
* ext/dl/mkcallback.rb (gencallback, gen_callback_file),
(rb_dl_init_callbacks): omit stdcall functions unless supported.
* lib/rubygems/config_file.rb (SHGetFolderPath): stdcall.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/config_file.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb index 276a5c151d..934516ed91 100644 --- a/lib/rubygems/config_file.rb +++ b/lib/rubygems/config_file.rb @@ -36,8 +36,8 @@ class Gem::ConfigFile CSIDL_COMMON_APPDATA = 0x0023 path = 0.chr * 260 - SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP', 'L' - SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path + SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP', 'L', :stdcall + SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path path.strip rescue LoadError |