diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-16 15:42:56 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-16 15:42:56 +0000 |
| commit | 12285fc1094bcbe290a8a12555f175c1eb41c88d (patch) | |
| tree | 91eed293d7d1cc819297e1d53a2ab8c2a9a62855 /include | |
| parent | 7fd56bd30fbc0cf3ddef760dd41627d4454adbea (diff) | |
merge revision(s) r45521,r45523,r45551: [Backport #9699]
win32.c: wchar conversion
* win32/win32.c (rb_w32_wstr_to_mbstr, rb_w32_mbstr_to_wstr): make
WCHAR/mb conversion functions public.
* dln.c (dln_load): use wchar version to load a library in
non-ascii path on Windows. based on the patch by Bugra Barin
<bugrabarin AT hotmail.com> in [ruby-core:61845]. [Bug #9699]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/win32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 070bab28f9..067ac010da 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -772,6 +772,8 @@ int rb_w32_wait_events_blocking(HANDLE *events, int num, DWORD timeout); int rb_w32_time_subtract(struct timeval *rest, const struct timeval *wait); int rb_w32_wrap_io_handle(HANDLE, int); int rb_w32_unwrap_io_handle(int); +WCHAR *rb_w32_mbstr_to_wstr(UINT, const char *, int, long *); +char *rb_w32_wstr_to_mbstr(UINT, const WCHAR *, int, long *); /* == ***CAUTION*** |