2010-04-27 Danny Smith <dannysmith@users.sourceforge.net>

        * mingwex/mb_wc_common.h (get_codepage): Revert change of 2006-09-19.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 8c671f7..95debcd 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-27 Danny Smith <dannysmith@users.sourceforge.net>
+
+       * mingwex/mb_wc_common.h (get_codepage): Revert change of 2006-09-19.
+
 2010-03-06 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
 
        * include/_mingw.h: Increment version to 3.18.

diff --git a/winsup/mingw/mingwex/mb_wc_common.h b/winsup/mingw/mingwex/mb_wc_common.h
index 40028d6..d1c2f9d 100755 (executable)
--- a/winsup/mingw/mingwex/mb_wc_common.h
+++ b/winsup/mingw/mingwex/mb_wc_common.h
@@ -1,7 +1,13 @@
-__declspec(dllimport) unsigned int __lc_codepage;
+#include <locale.h>
+#include <string.h>
+#include <stdlib.h>
 
 static inline
 unsigned int get_codepage (void)
 {
-  return __lc_codepage;
+  /* locale :: "lang[_country[.code_page]]" | ".code_page"  */
+  char * cp_string;
+  if ((cp_string = strchr (setlocale(LC_CTYPE, NULL), '.')))
+    return  ((unsigned) atoi (cp_string + 1));
+  return 0;
 }