diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-11-28 01:09:32 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-11-28 01:09:32 +0100 |
| commit | e6f2518067b058e204ed70679dcf1eaafd32325e (patch) | |
| tree | 028f75aecb1508b3f040d46b9bf8d935411b9e11 /lib | |
| parent | ee939eeffba5016bc6973956e811dfe12a5801e1 (diff) | |
| download | gnulib-e6f2518067b058e204ed70679dcf1eaafd32325e.tar.gz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fnmatch.c | 2 | ||||
| -rw-r--r-- | lib/fnmatch_loop.c | 1 | ||||
| -rw-r--r-- | lib/glob.c | 2 | ||||
| -rw-r--r-- | lib/tempname.c | 2 |
4 files changed, 0 insertions, 7 deletions
diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 346e1c6b26..bd25b4ca32 100644 --- 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 8334491d40..f35c10f9ed 100644 --- 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 85419ccfae..fddd02d1e9 100644 --- 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 139e0c3441..130ae97f8f 100644 --- 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) |