diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-09-19 09:09:58 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-09-19 09:09:58 +0000 |
| commit | c0b5e094e21ab5c0435f2f23edbd7e9f8f55ab63 (patch) | |
| tree | 56bfb32431ef91815946a77adaecf6529a798f11 | |
| parent | b44ba33a1fab5031a0a727b59016baf3d40db20d (diff) | |
| download | cygnal-c0b5e094e21ab5c0435f2f23edbd7e9f8f55ab63.tar.gz cygnal-c0b5e094e21ab5c0435f2f23edbd7e9f8f55ab63.tar.bz2 cygnal-c0b5e094e21ab5c0435f2f23edbd7e9f8f55ab63.zip | |
* mingwex/mb_wc_common.h (get_codepage): Get it
from __lc_codepage.
| -rw-r--r-- | winsup/mingw/ChangeLog | 5 | ||||
| -rwxr-xr-x | winsup/mingw/mingwex/mb_wc_common.h | 15 |
2 files changed, 7 insertions, 13 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 50ae26f81..c6d623534 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2006-09-19 Danny Smith <dannysmith@users.sourceforge.net> + + * mingwex/mb_wc_common.h (get_codepage): Get it + from __lc_codepage. + 2006-09-18 Danny Smith <dannysmith@users.sourceforge.net> * mingwex/gdtoa/g_xfmt.c (g_xfmt): Fix representation of infinity. diff --git a/winsup/mingw/mingwex/mb_wc_common.h b/winsup/mingw/mingwex/mb_wc_common.h index 8006d4bba..40028d682 100755 --- a/winsup/mingw/mingwex/mb_wc_common.h +++ b/winsup/mingw/mingwex/mb_wc_common.h @@ -1,18 +1,7 @@ -#include <locale.h> -#include <string.h> -#include <stdlib.h> +__declspec(dllimport) unsigned int __lc_codepage; static inline unsigned int get_codepage (void) { - char* cp_string; - /* - locale :: "lang[_country[.code_page]]" - | ".code_page" - - */ - - if ((cp_string = strchr(setlocale(LC_CTYPE, NULL), '.'))) - return ((unsigned) atoi (cp_string + 1)); - return 0; + return __lc_codepage; } |