From 9d2e070f0551a873787f62f427fa1062f9414913 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 4 Mar 2009 09:20:22 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/config_file.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb index 276a5c151..934516ed9 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 -- cgit