diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:39:56 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:39:56 +0000 |
| commit | 7a8e48c0759a10c9c88e299ed46fb82c75dd4b31 (patch) | |
| tree | 3f627152b86976f39249d246480e32807b2523ef /win32 | |
| parent | 2bf6720134ccc5330013ee60aa8f5cf62972758a (diff) | |
merges r21517 and r21519 from trunk into ruby_1_9_1.
* configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
and mswin.
* encoding.c (rb_locale_charmap): use environments on mingw and mswin.
* missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese
environment uses Windows-31J derived from Shift_JIS, not EUC-JP.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 124b438f6..498dec6d7 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -177,7 +177,7 @@ EXTLIBS = LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib $(EXTLIBS) !endif !if !defined(MISSING) -MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj +MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj langinfo.obj !endif ARFLAGS = -machine:$(MACHINE) -out: |