summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-01-15 18:39:29 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-01-15 18:39:29 +0000
commit0189d4d8e2eeb550bf56c1e0a83459bd018647f8 (patch)
treef4f5b6805d853807c988cc2ea4f68742b03e25a8
parenteba63c6f8fa24c141ce247b2216b2e800f02e77e (diff)
Remove __XL(N) and __XL_ALIAS(N) adapting the last use of it
-rw-r--r--libc/misc/ctype/ctype.c14
-rw-r--r--libc/sysdeps/linux/common/bits/uClibc_locale.h6
2 files changed, 6 insertions, 14 deletions
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index 6589e4177..cb1645ef7 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -103,7 +103,7 @@
#undef NDEBUG
#include <assert.h>
-extern void __isctype_assert(int c, int mask) __attribute__ ((__noreturn__));
+extern void __isctype_assert(int c, int mask) __attribute__ ((__noreturn__)) attribute_hidden;
#define CTYPE_BODY(NAME,C,MASK) \
if (CTYPE_DOMAIN_CHECK(C)) { \
@@ -159,7 +159,7 @@ int CTYPE_NAME(NAME) (int c) \
libc_hidden_proto(fprintf)
libc_hidden_proto(abort)
-void __isctype_assert(int c, int mask)
+attribute_hidden void __isctype_assert(int c, int mask)
{
fprintf(stderr, "%s: __is*{_l}(%d,%#x {locale})\n", __uclibc_progname, c, mask);
abort();
@@ -353,19 +353,19 @@ libc_hidden_def(toupper_l)
#ifdef __UCLIBC_HAS_CTYPE_TABLES__
-int __XL(isascii)(int c)
+int __XL_NPP(isascii)(int c)
{
return __isascii(c); /* locale-independent */
}
-__XL_ALIAS(isascii)
-
#else /* __UCLIBC_HAS_CTYPE_TABLES__ */
+libc_hidden_proto(isascii)
int isascii(int c)
{
return __isascii(c); /* locale-independent */
}
+libc_hidden_def(isascii)
#endif /* __UCLIBC_HAS_CTYPE_TABLES__ */
@@ -375,13 +375,11 @@ int isascii(int c)
#ifdef __UCLIBC_HAS_CTYPE_TABLES__
-int __XL(toascii)(int c)
+int __XL_NPP(toascii)(int c)
{
return __toascii(c); /* locale-independent */
}
-__XL_ALIAS(toascii)
-
#else /* __UCLIBC_HAS_CTYPE_TABLES__ */
int toascii(int c)
diff --git a/libc/sysdeps/linux/common/bits/uClibc_locale.h b/libc/sysdeps/linux/common/bits/uClibc_locale.h
index fe574170f..1de735a25 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_locale.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_locale.h
@@ -41,9 +41,7 @@
#define __LOCALE_C_ONLY
-#define __XL(N) N
#define __XL_NPP(N) N
-#define __XL_ALIAS(N)
#define __LOCALE_PARAM
#define __LOCALE_ARG
@@ -361,18 +359,14 @@ extern __locale_t __curlocale_set(__locale_t newloc);
/**********************************************************************/
#if defined(__UCLIBC_HAS_XLOCALE__) && defined(__UCLIBC_DO_XLOCALE)
-#define __XL(N) __ ## N ## _l
#define __XL_NPP(N) N ## _l
-#define __XL_ALIAS(N) weak_alias( __ ## N ## _l , N ## _l )
#define __LOCALE_PARAM , __locale_t locale_arg
#define __LOCALE_ARG , locale_arg
#define __LOCALE_PTR locale_arg
#else /* defined(__UCLIBC_HAS_XLOCALE__) && defined(__UCLIBC_DO_XLOCALE) */
-#define __XL(N) N
#define __XL_NPP(N) N
-#define __XL_ALIAS(N)
#define __LOCALE_PARAM
#define __LOCALE_ARG
#define __LOCALE_PTR __UCLIBC_CURLOCALE