summaryrefslogtreecommitdiff
path: root/libc/misc/locale
diff options
context:
space:
mode:
Diffstat (limited to 'libc/misc/locale')
-rw-r--r--libc/misc/locale/locale.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index 28ebb3fb2..c32d09722 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -1012,6 +1012,7 @@ static const unsigned char nl_data[C_LC_ALL + 1 + 90 + 320] = {
']', '\x00', '^', '[', 'n', 'N', ']', '\x00',
};
+libc_hidden_proto(nl_langinfo)
char *nl_langinfo(nl_item item)
{
unsigned int c;
@@ -1025,24 +1026,26 @@ char *nl_langinfo(nl_item item)
}
return (char *) cat_start; /* Conveniently, this is the empty string. */
}
-libc_hidden_proto(nl_langinfo)
libc_hidden_def(nl_langinfo)
#else /* __LOCALE_C_ONLY */
#if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
+libc_hidden_proto(nl_langinfo)
+
libc_hidden_proto(nl_langinfo_l)
char *nl_langinfo(nl_item item)
{
return nl_langinfo_l(item, __UCLIBC_CURLOCALE);
}
-libc_hidden_proto(nl_langinfo)
libc_hidden_def(nl_langinfo)
#else /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
+libc_hidden_proto(__XL_NPP(nl_langinfo))
+
static const char empty[] = "";
char *__XL_NPP(nl_langinfo)(nl_item item __LOCALE_PARAM )
@@ -1057,7 +1060,6 @@ char *__XL_NPP(nl_langinfo)(nl_item item __LOCALE_PARAM )
return (char *) empty;
}
-libc_hidden_proto(__XL_NPP(nl_langinfo))
libc_hidden_def(__XL_NPP(nl_langinfo))
#endif /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
@@ -1068,6 +1070,8 @@ libc_hidden_def(__XL_NPP(nl_langinfo))
/**********************************************************************/
#ifdef L_newlocale
+libc_hidden_proto(newlocale)
+
#ifdef __UCLIBC_MJN3_ONLY__
#warning TODO: Move posix and utf8 strings.
#endif
@@ -1305,13 +1309,14 @@ __locale_t newlocale(int category_mask, const char *locale, __locale_t base)
return base;
}
-libc_hidden_proto(newlocale)
libc_hidden_def(newlocale)
#endif
/**********************************************************************/
#ifdef L_duplocale
+libc_hidden_proto(duplocale)
+
#ifdef __UCLIBC_MJN3_ONLY__
#warning REMINDER: When we allocate ctype tables, remember to dup them.
#endif
@@ -1339,7 +1344,6 @@ __locale_t duplocale(__locale_t dataset)
}
return r;
}
-libc_hidden_proto(duplocale)
libc_hidden_def(duplocale)
#endif
@@ -1363,6 +1367,8 @@ void freelocale(__locale_t dataset)
/**********************************************************************/
#ifdef L_uselocale
+libc_hidden_proto(uselocale)
+
__locale_t uselocale(__locale_t dataset)
{
__locale_t old;
@@ -1386,7 +1392,6 @@ __locale_t uselocale(__locale_t dataset)
}
return old;
}
-libc_hidden_proto(uselocale)
libc_hidden_def(uselocale)
#endif