libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-01 12:00:35 +08:00
Code Issues Projects Releases Wiki Activity

locales: Fix definition of lc_messages_T::codeset

Browse Source 
nl_langinfo_l accesses lc_messages_T::codeset as soon as
__HAVE_LOCALE_INFO__ is defined, but codeset only exists
if __HAVE_LOCALE_INFO_EXTENDED__ is defined.

Fix this by defining lc_messages_T::codeset depending on
__HAVE_LOCALE_INFO__.

Fixes: ac7f1d5e931c ("Get rid of LCID, reformat type definitions in setlocale.h")
Reported-by: Inglis <Brian.Inglis@SystematicSW.ab.ca>
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2024-08-22 21:21:51 +02:00
parent d14b65bdd5
commit 1807336828
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/libc/locale/setlocale.h
View File

@ -162,13 +162,15 @@ struct lc_messages_T
const char *noexpr;
const char *yesstr;
const char *nostr;
#ifdef __HAVE_LOCALE_INFO_EXTENDED__
#ifdef __HAVE_LOCALE_INFO__
const char *codeset; /* codeset for mbtowc conversion */
#ifdef __HAVE_LOCALE_INFO_EXTENDED__
const wchar_t *wyesexpr;
const wchar_t *wnoexpr;
const wchar_t *wyesstr;
const wchar_t *wnostr;
#endif
#endif
};
extern const struct lc_messages_T _C_messages_locale;