summaryrefslogtreecommitdiff
path: root/libc/string
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-11-20 22:11:44 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-11-20 22:11:44 +0000
commitcb97aadebfeba7f5e8f1b85beee5ab10e88c2990 (patch)
treef5f56f2ef0f3048325419857d0b538135524ff8c /libc/string
parentb133fe1cac9f99b63ea56daf92caa1423b1289d0 (diff)
Last portion of libc_hidden_proto removal.
Appears to build fine (several .configs tried)
Diffstat (limited to 'libc/string')
-rw-r--r--libc/string/__glibc_strerror_r.c4
-rw-r--r--libc/string/__xpg_strerror_r.c2
-rw-r--r--libc/string/_collate.c12
-rw-r--r--libc/string/strcasecmp.c10
-rw-r--r--libc/string/strdup.c2
-rw-r--r--libc/string/strerror.c2
-rw-r--r--libc/string/strncasecmp.c10
-rw-r--r--libc/string/strtok_r.c4
8 files changed, 23 insertions, 23 deletions
diff --git a/libc/string/__glibc_strerror_r.c b/libc/string/__glibc_strerror_r.c
index 0f9cd16a9..2b856e9f5 100644
--- a/libc/string/__glibc_strerror_r.c
+++ b/libc/string/__glibc_strerror_r.c
@@ -8,8 +8,8 @@
#include <features.h>
#include <string.h>
-libc_hidden_proto(__glibc_strerror_r)
-libc_hidden_proto(__xpg_strerror_r)
+/* libc_hidden_proto(__glibc_strerror_r) */
+/* libc_hidden_proto(__xpg_strerror_r) */
char *__glibc_strerror_r(int errnum, char *strerrbuf, size_t buflen)
{
diff --git a/libc/string/__xpg_strerror_r.c b/libc/string/__xpg_strerror_r.c
index ff41192e5..274b6cec8 100644
--- a/libc/string/__xpg_strerror_r.c
+++ b/libc/string/__xpg_strerror_r.c
@@ -15,7 +15,7 @@
#undef strerror_r
-libc_hidden_proto(__xpg_strerror_r)
+/* libc_hidden_proto(__xpg_strerror_r) */
/* Experimentally off - libc_hidden_proto(memcpy) */
/* Experimentally off - libc_hidden_proto(strlen) */
diff --git a/libc/string/_collate.c b/libc/string/_collate.c
index 64b5d9608..3c53404ad 100644
--- a/libc/string/_collate.c
+++ b/libc/string/_collate.c
@@ -24,8 +24,8 @@
/* Experimentally off - libc_hidden_proto(strlcpy) */
/* Experimentally off - libc_hidden_proto(strcmp) */
#ifdef WANT_WIDE
-libc_hidden_proto(wcsxfrm)
-libc_hidden_proto(wcscmp)
+/* libc_hidden_proto(wcsxfrm) */
+/* libc_hidden_proto(wcscmp) */
#endif
#ifdef __UCLIBC_HAS_LOCALE__
@@ -59,18 +59,18 @@ libc_hidden_proto(wcscmp)
#if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE)
-libc_hidden_proto(wcscoll_l)
+/* libc_hidden_proto(wcscoll_l) */
-libc_hidden_proto(wcscoll)
+/* libc_hidden_proto(wcscoll) */
int wcscoll (const Wchar *s0, const Wchar *s1)
{
return wcscoll_l(s0, s1, __UCLIBC_CURLOCALE );
}
libc_hidden_def(wcscoll)
-libc_hidden_proto(wcsxfrm_l)
+/* libc_hidden_proto(wcsxfrm_l) */
-libc_hidden_proto(wcsxfrm)
+/* libc_hidden_proto(wcsxfrm) */
size_t wcsxfrm(Wchar *__restrict ws1, const Wchar *__restrict ws2, size_t n)
{
return wcsxfrm_l(ws1, ws2, n, __UCLIBC_CURLOCALE );
diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c
index a5254f327..94c8ff492 100644
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -12,22 +12,22 @@
#ifdef WANT_WIDE
# define strcasecmp wcscasecmp
# define strcasecmp_l wcscasecmp_l
-libc_hidden_proto(wcscasecmp)
+/* libc_hidden_proto(wcscasecmp) */
# if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-libc_hidden_proto(wcscasecmp_l)
+/* libc_hidden_proto(wcscasecmp_l) */
# endif
# ifdef __UCLIBC_DO_XLOCALE
-libc_hidden_proto(towlower_l)
+/* libc_hidden_proto(towlower_l) */
# define TOLOWER(C) towlower_l((C), locale_arg)
# else
-libc_hidden_proto(towlower)
+/* libc_hidden_proto(towlower) */
# define TOLOWER(C) towlower((C))
# endif
#else
/* Experimentally off - libc_hidden_proto(strcasecmp) */
/* Experimentally off - libc_hidden_proto(strcasecmp_l) */
# ifdef __UCLIBC_DO_XLOCALE
-libc_hidden_proto(tolower_l)
+/* libc_hidden_proto(tolower_l) */
# define TOLOWER(C) tolower_l((C), locale_arg)
# else
#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
diff --git a/libc/string/strdup.c b/libc/string/strdup.c
index 61fc186c8..9eb28630e 100644
--- a/libc/string/strdup.c
+++ b/libc/string/strdup.c
@@ -9,7 +9,7 @@
#include <stdlib.h>
#ifdef WANT_WIDE
-libc_hidden_proto(wcslen)
+/* libc_hidden_proto(wcslen) */
# define Wstrdup wcsdup
# define Wstrlen wcslen
#else
diff --git a/libc/string/strerror.c b/libc/string/strerror.c
index 355c7bdda..a52c407f8 100644
--- a/libc/string/strerror.c
+++ b/libc/string/strerror.c
@@ -10,7 +10,7 @@
#include "_syserrmsg.h"
/* Experimentally off - libc_hidden_proto(strerror) */
-libc_hidden_proto(__xpg_strerror_r)
+/* libc_hidden_proto(__xpg_strerror_r) */
char *strerror(int errnum)
{
diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c
index 9df9be59c..a9e7245a8 100644
--- a/libc/string/strncasecmp.c
+++ b/libc/string/strncasecmp.c
@@ -12,22 +12,22 @@
#ifdef WANT_WIDE
# define strncasecmp wcsncasecmp
# define strncasecmp_l wcsncasecmp_l
-libc_hidden_proto(wcsncasecmp)
+/* libc_hidden_proto(wcsncasecmp) */
# if defined(__USE_GNU) && defined(__UCLIBC_HAS_XLOCALE__)
-libc_hidden_proto(wcsncasecmp_l)
+/* libc_hidden_proto(wcsncasecmp_l) */
# endif
# ifdef __UCLIBC_DO_XLOCALE
-libc_hidden_proto(towlower_l)
+/* libc_hidden_proto(towlower_l) */
# define TOLOWER(C) towlower_l((C), locale_arg)
# else
-libc_hidden_proto(towlower)
+/* libc_hidden_proto(towlower) */
# define TOLOWER(C) towlower((C))
# endif
#else
/* Experimentally off - libc_hidden_proto(strncasecmp) */
/* Experimentally off - libc_hidden_proto(strncasecmp_l) */
# ifdef __UCLIBC_DO_XLOCALE
-libc_hidden_proto(tolower_l)
+/* libc_hidden_proto(tolower_l) */
# define TOLOWER(C) tolower_l((C), locale_arg)
# else
#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
index 2ad7746b1..c81231997 100644
--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c
@@ -8,8 +8,8 @@
#include "_string.h"
#ifdef WANT_WIDE
-libc_hidden_proto(wcsspn)
-libc_hidden_proto(wcspbrk)
+/* libc_hidden_proto(wcsspn) */
+/* libc_hidden_proto(wcspbrk) */
# define Wstrtok_r wcstok
# define Wstrspn wcsspn
# define Wstrpbrk wcspbrk