diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-20 15:56:49 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-20 15:56:49 +0000 |
commit | 6e6a8c02aff7207745808cdaa4b12e8f1e9ace82 (patch) | |
tree | 46ecaaa6532373645bbc1783dc7d891073222245 | |
parent | a30c1f48cfba503f99198068f5254f99692381c2 (diff) |
Fix calling convention
* 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | win32/win32.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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> * configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX): diff --git a/win32/win32.c b/win32/win32.c index b694d5a49b..4192a19add 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -436,7 +436,7 @@ get_special_folder(int n, WCHAR *buf, size_t len) LPITEMIDLIST pidl; LPMALLOC alloc; 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; if (func == (get_path_func)-1) { |