diff options
| author | Jim Meyering <jim@meyering.net> | 2004-01-16 09:55:31 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2004-01-16 09:55:31 +0000 |
| commit | 50733eb567bed22371fc87f2eb8447d3e9e07ecf (patch) | |
| tree | 0a86043639e144576cde6c5b1aec3dfe981a47f7 /lib/fnmatch.c | |
| parent | f1d3aedf657d960e67c74493caf556180517d18b (diff) | |
| download | coreutils-50733eb567bed22371fc87f2eb8447d3e9e07ecf.tar.xz | |
Merge fnmatch patches from glibc.
(mbsinit): Remove define.
Add libc_hidden_ver (__fnmatch, fnmatch).
Diffstat (limited to 'lib/fnmatch.c')
| -rw-r--r-- | lib/fnmatch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 28f98d8b9..d0cd8cdd7 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -74,7 +74,6 @@ char *alloca (); # include <shlib-compat.h> # define CONCAT(a,b) __CONCAT(a,b) -# define mbsinit __mbsinit # define mbsrtowcs __mbsrtowcs # define fnmatch __fnmatch extern int fnmatch (const char *pattern, const char *string, int flags); @@ -88,7 +87,7 @@ extern int fnmatch (const char *pattern, const char *string, int flags); #define NO_LEADING_PERIOD(flags) \ ((flags & (FNM_FILE_NAME | FNM_PERIOD)) == (FNM_FILE_NAME | FNM_PERIOD)) -/* Comment out all this code if we are using the GNU C Library, are not +/* Comment out all this code if we are using the GNU C Library, and are not actually compiling the library itself, and have not detected a bug in the library. This code is part of the GNU C Library, but also included in many other GNU distributions. Compiling @@ -398,6 +397,7 @@ versioned_symbol (libc, __fnmatch, fnmatch, GLIBC_2_2_3); strong_alias (__fnmatch, __fnmatch_old) compat_symbol (libc, __fnmatch_old, fnmatch, GLIBC_2_0); # endif +libc_hidden_ver (__fnmatch, fnmatch) # endif #endif /* _LIBC or not __GNU_LIBRARY__. */ |