Browse Source

_wctype.c, wctype.h: remove unused isw* and wctype_l hidden functions

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Peter S. Mazinger 13 years ago
parent
commit
3e223e6c18
2 changed files with 16 additions and 8 deletions
  1. 0 1
      include/wctype.h
  2. 16 7
      libc/misc/wctype/_wctype.c

+ 0 - 1
include/wctype.h

@@ -305,7 +305,6 @@ extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW;
    by the string argument PROPERTY.  */
 extern wctype_t wctype_l (__const char *__property, __locale_t __locale)
      __THROW;
-libc_hidden_proto(wctype_l)
 
 /* Determine whether the wide-character WC has the property described by
    DESC.  */

+ 16 - 7
libc/misc/wctype/_wctype.c

@@ -140,28 +140,27 @@ enum {
 #ifdef __UCLIBC_DO_XLOCALE
 
 #define ISW_FUNC_BODY(NAME) \
-libc_hidden_proto(__PASTE3(isw,NAME,_l)) \
 int __PASTE3(isw,NAME,_l) (wint_t wc, __locale_t l) \
 { \
 	return iswctype_l(wc, __PASTE2(_CTYPE_is,NAME), l); \
-} \
-libc_hidden_def(__PASTE3(isw,NAME,_l))
+}
 
 #else  /* __UCLIBC_DO_XLOCALE */
 
 #define ISW_FUNC_BODY(NAME) \
-libc_hidden_proto(__PASTE2(isw,NAME)) \
 int __PASTE2(isw,NAME) (wint_t wc) \
 { \
 	return iswctype(wc, __PASTE2(_CTYPE_is,NAME)); \
-} \
-libc_hidden_def(__PASTE2(isw,NAME))
+}
 
 #endif /* __UCLIBC_DO_XLOCALE */
 /**********************************************************************/
 #if defined(L_iswalnum) || defined(L_iswalnum_l)
 
 ISW_FUNC_BODY(alnum);
+# ifdef L_iswalnum
+libc_hidden_def(iswalnum)
+# endif
 
 #endif
 /**********************************************************************/
@@ -198,6 +197,9 @@ ISW_FUNC_BODY(graph);
 #if defined(L_iswlower) || defined(L_iswlower_l)
 
 ISW_FUNC_BODY(lower);
+# ifdef L_iswlower
+libc_hidden_def(iswlower)
+# endif
 
 #endif
 /**********************************************************************/
@@ -216,12 +218,20 @@ ISW_FUNC_BODY(punct);
 #if defined(L_iswspace) || defined(L_iswspace_l)
 
 ISW_FUNC_BODY(space);
+# ifdef L_iswspace
+libc_hidden_def(iswspace)
+# else
+libc_hidden_def(iswspace_l)
+# endif
 
 #endif
 /**********************************************************************/
 #if defined(L_iswupper) || defined(L_iswupper_l)
 
 ISW_FUNC_BODY(upper);
+# ifdef L_iswupper
+libc_hidden_def(iswupper)
+# endif
 
 #endif
 /**********************************************************************/
@@ -461,7 +471,6 @@ wctype_t wctype_l (const char *property, __locale_t locale)
 {
 	return wctype(property);
 }
-libc_hidden_def(wctype_l)
 
 #endif
 /**********************************************************************/