svn commit: trunk/uClibc/libc: misc/ctype sysdeps/linux/common/bits

[psm at uclibc.org]

Author: psm
Date: 2006-01-15 10:39:29 -0800 (Sun, 15 Jan 2006)
New Revision: 13350

Log:
Remove __XL(N) and __XL_ALIAS(N) adapting the last use of it

Modified:
   trunk/uClibc/libc/misc/ctype/ctype.c
   trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_locale.h


Changeset:
Modified: trunk/uClibc/libc/misc/ctype/ctype.c
===================================================================
--- trunk/uClibc/libc/misc/ctype/ctype.c	2006-01-15 17:59:48 UTC (rev 13349)
+++ trunk/uClibc/libc/misc/ctype/ctype.c	2006-01-15 18:39:29 UTC (rev 13350)
@@ -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 @@
 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 @@
 
 #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 @@
 
 #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)

Modified: trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_locale.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_locale.h	2006-01-15 17:59:48 UTC (rev 13349)
+++ trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_locale.h	2006-01-15 18:39:29 UTC (rev 13350)
@@ -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 @@
 /**********************************************************************/
 #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