summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-06-24 17:43:22 +0000
committerUlrich Drepper <drepper@redhat.com>1998-06-24 17:43:22 +0000
commitd47aac39992cb1dd705d8c584f4d3979d7ce4602 (patch)
tree00f122d0949ace189446bb9e8f4939ce170dcfde /sysdeps
parente951d34052a3e76fa3045de7b9368e65115b1345 (diff)
downloadglibc-d47aac39992cb1dd705d8c584f4d3979d7ce4602.tar.gz
glibc-d47aac39992cb1dd705d8c584f4d3979d7ce4602.tar.xz
glibc-d47aac39992cb1dd705d8c584f4d3979d7ce4602.zip
Update.
1998-06-24  Ulrich Drepper  <drepper@cygnus.com>

	* manager.c (pthread_free): Undo patch from 980430.
	Reported by David Wragg <dpw@doc.ic.ac.uk>.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/glob.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c
index c26b2a6115..bc32d99359 100644
--- a/sysdeps/generic/glob.c
+++ b/sysdeps/generic/glob.c
@@ -246,9 +246,11 @@ extern char *alloca ();
 
 /* Some system header files erroneously define these.
    We want our own definitions from <fnmatch.h> to take precedence.  */
-#undef	FNM_PATHNAME
-#undef	FNM_NOESCAPE
-#undef	FNM_PERIOD
+#ifndef __GNU_LIBRARY__
+# undef	FNM_PATHNAME
+# undef	FNM_NOESCAPE
+# undef	FNM_PERIOD
+#endif
 #include <fnmatch.h>
 
 /* Some system header files erroneously define these.