diff options
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/nlsfuncs.cc | 3 | ||||
| -rw-r--r-- | winsup/cygwin/regex/regcomp.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc index 9ff1ef2b8..3e3b5f42a 100644 --- a/winsup/cygwin/nlsfuncs.cc +++ b/winsup/cygwin/nlsfuncs.cc @@ -1527,7 +1527,8 @@ internal_setlocale () if (cygheap->locale.mbtowc == __global_locale.mbtowc) return; - debug_printf ("Cygwin charset chang to %s", __locale_charset ()); + debug_printf ("Global charset set to %s", + __locale_charset (&__global_locale)); /* Fetch PATH and CWD and convert to wchar_t in previous charset. */ path = getenv ("PATH"); if (path && *path) /* $PATH can be potentially unset. */ diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index 0dc59ffcc..63ca4f131 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -1132,7 +1132,7 @@ wgetnext(struct parse *p) invalid ASCII chars. To be more Linux-compatible, we align the behaviour to glibc here. Allow any character value if the current local's codeset is ASCII. */ - if (*__locale_charset () == 'A') /* SCII */ + if (*__current_locale_charset () == 'A') /* SCII */ return (wint_t) (unsigned char) *p->next++; #endif memset(&mbs, 0, sizeof(mbs)); @@ -1503,7 +1503,7 @@ findmust(struct parse *p, struct re_guts *g) */ if (MB_CUR_MAX > 1 && #ifdef __CYGWIN__ - strcmp(__locale_charset (), "UTF-8") != 0) + strcmp(__current_locale_charset (), "UTF-8") != 0) #else strcmp(_CurrentRuneLocale->__encoding, "UTF-8") != 0) #endif |