From dfbfc68a5b8d05b642dafca84a8e6affb68b7241 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 19 Jul 2011 19:24:45 +0000 Subject: [PATCH] * libc/locale/lmessages.c (_C_messages_locale): Move __HAVE_LOCALE_INFO_EXTENDED__ before codeset. --- newlib/ChangeLog | 5 +++++ newlib/libc/locale/lmessages.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 56285cc93..369654126 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2011-07-19 Ralf Corsépius + + * libc/locale/lmessages.c (_C_messages_locale): + Move __HAVE_LOCALE_INFO_EXTENDED__ before codeset. + 2011-07-19 Matt Johnson * libc/reent/sbrkr.c: Define _sbrk_r independently of the definition diff --git a/newlib/libc/locale/lmessages.c b/newlib/libc/locale/lmessages.c index c5bb9b397..33a4a5a21 100644 --- a/newlib/libc/locale/lmessages.c +++ b/newlib/libc/locale/lmessages.c @@ -41,10 +41,10 @@ static const struct lc_messages_T _C_messages_locale = { "^[yY]" , /* yesexpr */ "^[nN]" , /* noexpr */ "yes" , /* yesstr */ - "no" , /* nostr */ - "ASCII" /* codeset */ + "no" /* nostr */ #ifdef __HAVE_LOCALE_INFO_EXTENDED__ - , L"^[yY]" , /* wyesexpr */ + , "ASCII" , /* codeset */ + L"^[yY]" , /* wyesexpr */ L"^[nN]" , /* wnoexpr */ L"yes" , /* wyesstr */ L"no" /* wnostr */