From 6e7ce50e0415b05736f6f56377ecb2f8147e94cc Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 16 Aug 2016 15:24:26 +0200 Subject: [PATCH] Expose locale category accessor functions to non-__HAVE_LOCALE_INFO__ targets. These functions are used from, e.g., nl_langinfo or strftime, so we need them for all targets. Just return "C" locale category for non-__HAVE_LOCALE_INFO__ targets. Signed-off-by: Corinna Vinschen --- newlib/libc/locale/setlocale.h | 50 +++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h index 03b1dd7de..7aa676a5b 100644 --- a/newlib/libc/locale/setlocale.h +++ b/newlib/libc/locale/setlocale.h @@ -322,7 +322,55 @@ __get_current_messages_locale (void) return (const struct lc_messages_T *) __get_current_locale ()->lc_cat[LC_MESSAGES].ptr; } -#endif +#else /* ! __HAVE_LOCALE_INFO__ */ +_ELIDABLE_INLINE const struct lc_monetary_T * +__get_monetary_locale (struct __locale_t *locale) +{ + return _C_monetary_locale; +} + +_ELIDABLE_INLINE const struct lc_monetary_T * +__get_current_monetary_locale (void) +{ + return _C_monetary_locale; +} + +_ELIDABLE_INLINE const struct lc_numeric_T * +__get_numeric_locale (struct __locale_t *locale) +{ + return _C_numeric_locale; +} + +_ELIDABLE_INLINE const struct lc_numeric_T * +__get_current_numeric_locale (void) +{ + return _C_numeric_locale; +} + +_ELIDABLE_INLINE const struct lc_time_T * +__get_time_locale (struct __locale_t *locale) +{ + return _C_time_locale; +} + +_ELIDABLE_INLINE const struct lc_time_T * +__get_current_time_locale (void) +{ + return _C_time_locale; +} + +_ELIDABLE_INLINE const struct lc_messages_T * +__get_messages_locale (struct __locale_t *locale) +{ + return _C_messages_locale; +} + +_ELIDABLE_INLINE const struct lc_messages_T * +__get_current_messages_locale (void) +{ + return _C_messages_locale; +} +#endif /* !__HAVE_LOCALE_INFO__ */ _ELIDABLE_INLINE const char * __locale_charset (void) -- 2.43.5