Browse Source

deal with TODOs left over from libc_hidden_proto removal
(fixes build with locale enabled)

Denis Vlasenko 15 years ago
parent
commit
3e8067a627
3 changed files with 5 additions and 10 deletions
  1. 1 6
      libc/misc/ctype/ctype.c
  2. 3 3
      libc/misc/wchar/wchar.c
  3. 1 1
      libc/sysdeps/linux/common/mremap.c

+ 1 - 6
libc/misc/ctype/ctype.c

@@ -468,11 +468,7 @@ libc_hidden_def(__ctype_toupper_loc)
 /**********************************************************************/
 #ifdef L___C_ctype_b
 
-//vda:TODO:make static
-
-extern const __ctype_mask_t __C_ctype_b_data[];
-libc_hidden_proto(__C_ctype_b_data)
-const __ctype_mask_t __C_ctype_b_data[] = {
+static const __ctype_mask_t __C_ctype_b_data[] = {
 #ifdef __UCLIBC_HAS_CTYPE_SIGNED__
 	/* -128  M-^@ */ 0,
 	/* -127  M-^A */ 0,
@@ -860,7 +856,6 @@ const __ctype_mask_t __C_ctype_b_data[] = {
 	/*  254  M-~  */ 0,
 	/*  255  M-^? */ 0
 };
-libc_hidden_data_def(__C_ctype_b_data)
 
 /* libc_hidden_proto(__C_ctype_b) */
 const __ctype_mask_t *__C_ctype_b = __C_ctype_b_data + __UCLIBC_CTYPE_B_TBL_OFFSET;

+ 3 - 3
libc/misc/wchar/wchar.c

@@ -1238,10 +1238,10 @@ enum {
  *
  */
 
-//vda:TODO: make hidden
-
+/* Used externally only by iconv utility */
 extern const unsigned char __iconv_codesets[];
-/* libc_hidden_proto(__iconv_codesets) */
+libc_hidden_proto(__iconv_codesets)
+
 const unsigned char __iconv_codesets[] =
 	"\x0a\xe0""WCHAR_T\x00"		/* superset of UCS-4 but platform-endian */
 #if __BYTE_ORDER == __BIG_ENDIAN

+ 1 - 1
libc/sysdeps/linux/common/mremap.c

@@ -12,7 +12,7 @@
 
 #ifdef __NR_mremap
 
-//vda:TODO: add comment and explain why??
+/* Why do we do this?! */
 
 #define mremap _hidemremap
 #include <sys/mman.h>