diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-18 14:17:22 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-18 14:17:22 +0000 |
| commit | 4c3d49e91744f62532019261429c044c63b64c44 (patch) | |
| tree | 8a098f6df6c4a90d6cdb17e0aafadd67d14776f3 /win32 | |
| parent | f376d0efe243a85a8ab8566ca2922ee9029da88f (diff) | |
merge revision(s) 55729: [Backport #12611]
* vm.c (vm_set_main_stack): remove unnecessary check. toplevel
binding must be initialized. [Bug #12611] (N1)
* win32/win32.c (w32_symlink): fix return type. [Bug #12611] (N3)
* string.c (rb_str_split_m): simplify the condition.
[Bug #12611](N4)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c index 17cfc44abc..9960ddc6ce 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4930,7 +4930,7 @@ w32_symlink(UINT cp, const char *src, const char *link) DWORD flag = 0; BOOLEAN ret; - typedef DWORD (WINAPI *create_symbolic_link_func)(WCHAR*, WCHAR*, DWORD); + typedef BOOLEAN (WINAPI *create_symbolic_link_func)(WCHAR*, WCHAR*, DWORD); static create_symbolic_link_func create_symbolic_link = (create_symbolic_link_func)-1; |