1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix calling convention

Browse Source 
* win32/win32.c (get_special_folder): fix calling convention of
  SHGetPathFromIDListEx, which should be WINAPI.  pointed out by
  @arton at http://twitter.com/arton/status/744884064277016576

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-06-20 15:56:49 +00:00
parent a30c1f48cf
commit 6e6a8c02af
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Jun 21 00:56:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (get_special_folder): fix calling convention of
SHGetPathFromIDListEx, which should be WINAPI. pointed out by
@arton at http://twitter.com/arton/status/744884064277016576
Tue Jun 21 00:22:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Jun 21 00:22:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX): * configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX):

2
win32/win32.c
View File

@ -436,7 +436,7 @@ get_special_folder(int n, WCHAR *buf, size_t len)
LPITEMIDLIST pidl; LPITEMIDLIST pidl;
LPMALLOC alloc; LPMALLOC alloc;
BOOL f = FALSE; BOOL f = FALSE;
typedef BOOL (*get_path_func)(LPITEMIDLIST, WCHAR*, DWORD, int); typedef BOOL (WINAPI *get_path_func)(LPITEMIDLIST, WCHAR*, DWORD, int);
static get_path_func func = (get_path_func)-1; static get_path_func func = (get_path_func)-1;
if (func == (get_path_func)-1) { if (func == (get_path_func)-1) {