From 3e8067a62725780222fa90f2945f1d5599a5cdd6 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 21 Nov 2008 08:15:19 +0000 Subject: deal with TODOs left over from libc_hidden_proto removal (fixes build with locale enabled) --- libc/misc/ctype/ctype.c | 7 +------ libc/misc/wchar/wchar.c | 6 +++--- libc/sysdeps/linux/common/mremap.c | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index fe2cfb657..4b62fc34c 100644 --- a/libc/misc/ctype/ctype.c +++ b/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; diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 9a0ceb293..86b056000 100644 --- a/libc/misc/wchar/wchar.c +++ b/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 diff --git a/libc/sysdeps/linux/common/mremap.c b/libc/sysdeps/linux/common/mremap.c index 70627af9e..0295a25da 100644 --- a/libc/sysdeps/linux/common/mremap.c +++ b/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 -- cgit v1.2.3