Mercurial > hg > octave-kai > gnulib-hg
changeset 16127:e6b64482119f
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.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 28 Nov 2011 01:09:32 +0100 |
parents | 4eabecda57ee |
children | 6beadb731202 |
files | ChangeLog lib/fnmatch.c lib/fnmatch_loop.c lib/glob.c lib/tempname.c |
diffstat | 5 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +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.
--- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -168,7 +168,6 @@ # 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 @@ # 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
--- a/lib/fnmatch_loop.c +++ b/lib/fnmatch_loop.c @@ -1214,7 +1214,6 @@ #undef END #undef MEMPCPY #undef MEMCHR -#undef STRCOLL #undef STRLEN #undef STRCAT #undef L_
--- 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 */
--- 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)