Convert all the rest, remove isxupper/isxlower, if someone objects, I'll add it back

3 files changed, 3 insertions, 32 deletions

diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index 837de8adf..0c0c21182 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -37,6 +37,7 @@
 #define mmap __mmap
 #define sscanf __sscanf
 #define fscanf __fscanf
+#define fgets __fgets
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libc/sysdeps/linux/common/_exit.c b/libc/sysdeps/linux/common/_exit.c
index a36f5a128..4e450bbc5 100644
--- a/libc/sysdeps/linux/common/_exit.c
+++ b/libc/sysdeps/linux/common/_exit.c
@@ -34,7 +34,7 @@ static inline _syscall1(void, __syscall_exit, int, status);
 
 #undef _exit
 #undef _exit_internal
-void attribute_noreturn _exit_internal(int status)
+void attribute_noreturn attribute_hidden _exit_internal(int status)
 {
 	/* The loop is added only to keep gcc happy. */
 	while(1)
diff --git a/libc/sysdeps/linux/common/bits/uClibc_ctype.h b/libc/sysdeps/linux/common/bits/uClibc_ctype.h
index 7c2d412cf..50cbd6bb2 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_ctype.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_ctype.h
@@ -134,17 +134,6 @@ enum {
 #define __C_tolower(c) (__C_isupper(c) ? ((c) | 0x20) : (c))
 #define __C_toupper(c) (__C_islower(c) ? ((c) ^ 0x20) : (c))
 
-#define __C_isxlower(c) \
-	(__C_isdigit(c) \
-	 || ((sizeof(c) == sizeof(char)) \
-		 ? (((unsigned char)(((c)) - 'a')) < 6) \
-		 : (((unsigned int)(((c)) - 'a')) < 6)))
-#define __C_isxupper(c) \
-	(__C_isdigit(c) \
-	 || ((sizeof(c) == sizeof(char)) \
-		 ? (((unsigned char)(((c)) - 'A')) < 6) \
-		 : (((unsigned int)(((c)) - 'A')) < 6)))
-
 /**********************************************************************/
 __BEGIN_DECLS
 
@@ -171,14 +160,7 @@ extern int isascii(int c) __THROW;
 extern int toascii(int c) __THROW;
 #endif
 
-/* The following are included for compatibility with older versions of
- * uClibc; but now they're only visible if MISC funcctionality is requested.
- * However, as they are locale-independent, the hidden macro versions are
- * always present. */
-#ifdef __USE_MISC
-extern int isxlower(int c) __THROW;	/* uClibc-specific. */
-extern int isxupper(int c) __THROW;	/* uClibc-specific. */
-
+#if defined _LIBC && (defined NOT_IN_libc || defined IS_IN_libc)
 /* isdigit() is really locale-invariant, so provide some small fast macros.
  * These are uClibc-specific. */
 #define __isdigit_char(C)    (((unsigned char)((C) - '0')) <= 9)
@@ -203,12 +185,6 @@ extern int isxupper(int c) __THROW;	/* uClibc-specific. */
 #define _tolower(c) ((c) | 0x20)
 
 
-/* For compatibility with older versions of uClibc.  Are these ever used? */
-#if 0
-#define __isxlower(c)	__C_isxlower(c)	/* uClibc-specific. */
-#define __isxupper(c)	__C_isxupper(c)	/* uClibc-specific. */
-#endif
-
 /* Apparently, glibc implements things as macros if __NO_CTYPE isn't defined.
  * If we don't have locale support, we'll do the same.  Otherwise, we'll
  * only use macros for the supported-locale-invariant cases. */
@@ -264,9 +240,6 @@ __END_DECLS
 #define __ispunct(c)		__body(ispunct,c)
 #define __isgraph(c)		__body(isgraph,c)
 
-#define __isxlower(c)		__body(isxlower,c)
-#define __isxupper(c)		__body(isxupper,c)
-
 #define __tolower(c)		__body(tolower,c)
 #define __toupper(c)		__body(toupper,c)
 
@@ -285,9 +258,6 @@ __END_DECLS
 #define ispunct(c)			__ispunct(c)
 #define isgraph(c)			__isgraph(c)
 
-#define isxlower(c)			__isxlower(c)
-#define isxupper(c)			__isxupper(c)
-
 #define tolower(c)			__tolower(c)
 #define toupper(c)			__toupper(c)