Remove unused macros from !_LIBC code in glibc-borrowed files.

* lib/fnmatch.c (STRCOLL): Remove macro.
* lib/fnmatch_loop.c (STRCOLL): Remove undef.
* lib/glob.c (__stat, __readdir64): Remove macros.
* lib/tempname.c (__open64, __xstat64): Remove macros.
Suggested by Paul Eggert.

diff --git a/ChangeLog b/ChangeLog
index 9f8b30b..cdc32a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-11-27  Bruno Haible  <bruno@clisp.org>
 
+       Remove unused macros from !_LIBC code in glibc-borrowed files.
+       * lib/fnmatch.c (STRCOLL): Remove macro.
+       * lib/fnmatch_loop.c (STRCOLL): Remove undef.
+       * lib/glob.c (__stat, __readdir64): Remove macros.
+       * lib/tempname.c (__open64, __xstat64): Remove macros.
+       Suggested by Paul Eggert.
+
+2011-11-27  Bruno Haible  <bruno@clisp.org>
+
        getcwd: Fix link error on MSVC 9.
        * modules/getcwd (Depends-on): Add readdir, rewinddir.
 

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 346e1c6..bd25b4c 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -168,7 +168,6 @@ static int posixly_correct;
 #  endif
 # endif
 # define MEMCHR(S, C, N) memchr (S, C, N)
-# define STRCOLL(S1, S2) strcoll (S1, S2)
 # include "fnmatch_loop.c"
 
 
@@ -196,7 +195,6 @@ static int posixly_correct;
 #   endif
 #  endif
 #  define MEMCHR(S, C, N) wmemchr (S, C, N)
-#  define STRCOLL(S1, S2) wcscoll (S1, S2)
 #  define WIDE_CHAR_VERSION 1
 
 #  undef IS_CHAR_CLASS

diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index 8334491..f35c10f 100644 (file)
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -1214,7 +1214,6 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
 #undef END
 #undef MEMPCPY
 #undef MEMCHR
-#undef STRCOLL
 #undef STRLEN
 #undef STRCAT
 #undef L_

diff --git a/lib/glob.c b/lib/glob.c
index 85419cc..fddd02d 100644 (file)
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -145,10 +145,8 @@
 # define __stat64(fname, buf)   stat (fname, buf)
 # define __fxstatat64(_, d, f, st, flag) fstatat (d, f, st, flag)
 # define struct_stat64          struct stat
-# define __stat(fname, buf)     stat (fname, buf)
 # define __alloca               alloca
 # define __readdir              readdir
-# define __readdir64            readdir64
 # define __glob_pattern_p       glob_pattern_p
 #endif /* _LIBC */
 

diff --git a/lib/tempname.c b/lib/tempname.c
index 139e0c3..130ae97 100644 (file)
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -67,9 +67,7 @@
 # define __gettimeofday gettimeofday
 # define __mkdir mkdir
 # define __open open
-# define __open64 open
 # define __lxstat64(version, file, buf) lstat (file, buf)
-# define __xstat64(version, file, buf) stat (file, buf)
 #endif
 
 #if ! (HAVE___SECURE_GETENV || _LIBC)