From 8f108fb0cf0635ed3c6ba55a3bed97631edeab62 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Jan 2009 14:05:45 +0000
Subject: merges r21311 from trunk into ruby_1_9_1. * encoding.c
 (rb_filesystem_encoding, rb_locale_charmap): uses   codepage on cygwin. 
 [ruby-core:20994]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index eca4140a02..73eda32cb4 100644
--- a/encoding.c
+++ b/encoding.c
@@ -13,11 +13,19 @@
 #include "ruby/encoding.h"
 #include "regenc.h"
 #include <ctype.h>
-#ifdef HAVE_LANGINFO_H
+#ifndef NO_LOCALE_CHARMAP
+#if defined __CYGWIN__
+#include <windows.h>
+#elif defined HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
+#endif
 #include "ruby/util.h"
 
+#if defined _WIN32 || defined __CYGWIN__
+#define USE_CODEPAGE_LOCALE 1
+#endif
+
 static ID id_encoding;
 VALUE rb_cEncoding;
 static VALUE rb_encoding_list;
@@ -1025,7 +1033,7 @@ rb_encoding *
 rb_filesystem_encoding(void)
 {
     rb_encoding *enc;
-#if defined _WIN32
+#if defined USE_CODEPAGE_LOCALE
     enc = rb_locale_encoding();
 #elif defined __APPLE__
     enc = rb_enc_find("UTF8-MAC");
@@ -1204,12 +1212,12 @@ rb_locale_charmap(VALUE klass)
 {
 #if defined NO_LOCALE_CHARMAP
     return rb_usascii_str_new2("ASCII-8BIT");
+#elif defined USE_CODEPAGE_LOCALE
+    return rb_sprintf("CP%d", GetACP());
 #elif defined HAVE_LANGINFO_H
     char *codeset;
     codeset = nl_langinfo(CODESET);
     return rb_usascii_str_new2(codeset);
-#elif defined _WIN32
-    return rb_sprintf("CP%d", GetACP());
 #else
     return Qnil;
 #endif
-- 
cgit v1.2.3