summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-11-03 08:43:20 +0000
committerJim Meyering <jim@meyering.net>2000-11-03 08:43:20 +0000
commitffc35388d283da9210b889725950acc08583528e (patch)
tree1648d248bde5a255433d2e5755f458a107ebd285
parentc8d3fe3f072856ae63025d5766535fd9d203d6b5 (diff)
downloadgnulib-ffc35388d283da9210b889725950acc08583528e.tar.gz
Do not comment out all the code if we are using
the GNU C library, because in some cases we are replacing buggy code in the GNU C library itself.
-rw-r--r--lib/.cppi-disable1
-rw-r--r--lib/fnmatch.c16
2 files changed, 2 insertions, 15 deletions
diff --git a/lib/.cppi-disable b/lib/.cppi-disable
index cfacdfc638..96c8b7734b 100644
--- a/lib/.cppi-disable
+++ b/lib/.cppi-disable
@@ -8,3 +8,4 @@ obstack.h
regex.h
regex.c
getpagesize.h
+fnmatch.c
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index ce55c7ff04..8499a462d2 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -27,22 +27,10 @@
#include <fnmatch.h>
#include <ctype.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#if defined _LIBC || !defined __GNU_LIBRARY__
-
-
# if defined STDC_HEADERS || !defined isascii
# define IN_CTYPE_DOMAIN(c) 1
# else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
+# define IN_CTYPE_DOMAIN(c) isascii (c)
# endif
# define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
@@ -240,5 +228,3 @@ fnmatch (const char *pattern, const char *string, int flags)
# undef FOLD
}
-
-#endif /* _LIBC or not __GNU_LIBRARY__. */