diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-08-23 13:38:28 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-08-23 13:38:28 +0300 |
| commit | 2fb5e3dfb2603988640c87d69596f470900e1ff5 (patch) | |
| tree | 149539449f04a169835969614d3334eaa6eb5b44 /winsup/cygwin/nlsfuncs.cc | |
| parent | 113abc27a6df3325f024aa2c5aff30126cfeb247 (diff) | |
Reference __global_locale only via __get_global_locale.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/nlsfuncs.cc')
| -rw-r--r-- | winsup/cygwin/nlsfuncs.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc index 3e3b5f42a..60ad2d375 100644 --- a/winsup/cygwin/nlsfuncs.cc +++ b/winsup/cygwin/nlsfuncs.cc @@ -1524,11 +1524,11 @@ internal_setlocale () wchar_t *w_path = NULL, *w_cwd; /* Don't do anything if the charset hasn't actually changed. */ - if (cygheap->locale.mbtowc == __global_locale.mbtowc) + if (cygheap->locale.mbtowc == __get_global_locale ()->mbtowc) return; debug_printf ("Global charset set to %s", - __locale_charset (&__global_locale)); + __locale_charset (__get_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. */ @@ -1541,7 +1541,7 @@ internal_setlocale () sys_cp_mbstowcs (cygheap->locale.mbtowc, w_cwd, 32768, cygheap->cwd.get_posix ()); /* Set charset for internal conversion functions. */ - cygheap->locale.mbtowc = __global_locale.mbtowc; + cygheap->locale.mbtowc = __get_global_locale ()->mbtowc; if (cygheap->locale.mbtowc == __ascii_mbtowc) cygheap->locale.mbtowc = __utf8_mbtowc; /* Restore CWD and PATH in new charset. */ |