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 /ext | |
| 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 'ext')
| -rw-r--r-- | ext/-test-/win32/dln/empty/empty.c | 4 | ||||
| -rw-r--r-- | ext/-test-/win32/dln/empty/extconf.rb | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ext/-test-/win32/dln/empty/empty.c b/ext/-test-/win32/dln/empty/empty.c new file mode 100644 index 0000000000..c4f94f1644 --- /dev/null +++ b/ext/-test-/win32/dln/empty/empty.c @@ -0,0 +1,4 @@ +void +Init_empty(void) +{ +} diff --git a/ext/-test-/win32/dln/empty/extconf.rb b/ext/-test-/win32/dln/empty/extconf.rb new file mode 100644 index 0000000000..a4efed90c9 --- /dev/null +++ b/ext/-test-/win32/dln/empty/extconf.rb @@ -0,0 +1,3 @@ +if $mingw or $mswin + create_makefile("-test-/win32/dln/empty") +end |