summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/nlsfuncs.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2016-08-20 16:05:56 +0200
committerCorinna Vinschen <corinna@vinschen.de>2016-08-20 17:14:56 +0200
commit7630e384623f778b88be8926e2c2a2e6fcbd9008 (patch)
tree7a3efa5017679ab797cf264b9290ebd281cd0ddc /winsup/cygwin/nlsfuncs.cc
parent06ac6718119dfd382c1904b1162f6cd7f9749dc3 (diff)
downloadcygnal-7630e384623f778b88be8926e2c2a2e6fcbd9008.tar.gz
cygnal-7630e384623f778b88be8926e2c2a2e6fcbd9008.tar.bz2
cygnal-7630e384623f778b88be8926e2c2a2e6fcbd9008.zip
Introduce __current_locale_charset/__locale_charset
The former __locale_charset always fetched the current locale's charset. We need the per-locale charset, too, in future. Rename __locale_charset to __current_locale_charset and change __locale_charset to take a locale_t as parameter. Accommodate througout. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/nlsfuncs.cc')
-rw-r--r--winsup/cygwin/nlsfuncs.cc3
1 files changed, 2 insertions, 1 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. */