From cb97aadebfeba7f5e8f1b85beee5ab10e88c2990 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Thu, 20 Nov 2008 22:11:44 +0000
Subject: Last portion of libc_hidden_proto removal. Appears to build fine
 (several .configs tried)

---
 libc/misc/glob/glob-susv3.c | 22 +++++++++++-----------
 libc/misc/glob/glob.c       | 28 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'libc/misc/glob')

diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c
index b1f1a6ad7..8ee0f1a37 100644
--- a/libc/misc/glob/glob-susv3.c
+++ b/libc/misc/glob/glob-susv3.c
@@ -29,10 +29,10 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(closedir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(fnmatch) */
 
 struct match
 {
@@ -53,11 +53,11 @@ extern int __glob_match_in_dir(const char *d, const char *p, int flags, int (*er
 # define stat stat64
 # define readdir_r readdir64_r
 # define dirent dirent64
-libc_hidden_proto(readdir64_r)
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(readdir64_r) */
+/* libc_hidden_proto(stat64) */
 # define struct_stat struct stat64
 #else
-libc_hidden_proto(readdir_r)
+/* libc_hidden_proto(readdir_r) */
 /* libc_hidden_proto(stat) */
 # define struct_stat struct stat
 #endif
@@ -224,9 +224,9 @@ int __glob_sort(const void *a, const void *b)
 #endif /* !__GLOB64 */
 
 #ifdef __GLOB64
-libc_hidden_proto(glob64)
+/* libc_hidden_proto(glob64) */
 #else
-libc_hidden_proto(glob)
+/* libc_hidden_proto(glob) */
 #endif
 int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), glob_t *g)
 {
@@ -302,9 +302,9 @@ libc_hidden_def(glob)
 #endif
 
 #ifdef __GLOB64
-libc_hidden_proto(globfree64)
+/* libc_hidden_proto(globfree64) */
 #else
-libc_hidden_proto(globfree)
+/* libc_hidden_proto(globfree) */
 #endif
 void globfree(glob_t *g)
 {
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index abc75dee5..5736f4981 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -31,13 +31,13 @@
 #include <fnmatch.h>
 #include <glob.h>
 
-libc_hidden_proto(closedir)
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(fnmatch) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(readdir)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(readdir) */
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strcoll) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
@@ -48,7 +48,7 @@ libc_hidden_proto(readdir)
 
 #ifdef ENABLE_GLOB_TILDE_EXPANSION
 #include <pwd.h>
-libc_hidden_proto(getpwnam_r)
+/* libc_hidden_proto(getpwnam_r) */
 #endif
 
 #ifdef COMPILE_GLOB64
@@ -62,13 +62,13 @@ libc_hidden_proto(getpwnam_r)
 #define glob_t glob64_t
 #define glob(pattern, flags, errfunc, pglob) glob64 (pattern, flags, errfunc, pglob)
 #define globfree(pglob) globfree64 (pglob)
-libc_hidden_proto(stat64)
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(stat64) */
+/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir readdir
 #ifdef __UCLIBC_HAS_LFS__
 #define __readdir64 readdir64
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir64 readdir
 #endif
@@ -132,7 +132,7 @@ extern int __prefix_array (const char *dirname, char **array, size_t n) attribut
 extern const char *__next_brace_sub (const char *cp, int flags) attribute_hidden;
 #endif
 
-libc_hidden_proto(glob_pattern_p)
+/* libc_hidden_proto(glob_pattern_p) */
 #ifndef COMPILE_GLOB64
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
@@ -489,11 +489,11 @@ static int glob_in_dir (const char *pattern, const char *directory, int flags,
 }
 
 #ifdef COMPILE_GLOB64
-libc_hidden_proto(glob64)
-libc_hidden_proto(globfree64)
+/* libc_hidden_proto(glob64) */
+/* libc_hidden_proto(globfree64) */
 #else
-libc_hidden_proto(glob)
-libc_hidden_proto(globfree)
+/* libc_hidden_proto(glob) */
+/* libc_hidden_proto(globfree) */
 #endif
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
-- 
cgit v1.2.3