about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-11-15 18:27:28 +0000
committerUlrich Drepper <drepper@redhat.com>2001-11-15 18:27:28 +0000
commitf6b20a369edc673dda3cbf566d759d3a2e70037a (patch)
treec08a0e4894f210e1d9911d95d9163b67dd7d0c05
parent447e5dfd2b8e262a2708a8993db96a2c81f52f64 (diff)
downloadglibc-f6b20a369edc673dda3cbf566d759d3a2e70037a.tar.gz
glibc-f6b20a369edc673dda3cbf566d759d3a2e70037a.tar.xz
glibc-f6b20a369edc673dda3cbf566d759d3a2e70037a.zip
Update.
2001-11-15  Jeff Law  <law@redhat.com>

	* posix/regex.c (uintptr_t): Do not provide a definition if the
	system provided one.
-rw-r--r--ChangeLog5
-rw-r--r--posix/regex.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d301cd7e84..7851b1b87c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-15  Jeff Law  <law@redhat.com>
+
+	* posix/regex.c (uintptr_t): Do not provide a definition if the
+	system provided one.
+
 2001-11-13  Roland McGrath  <roland@frob.com>
 
 	* stdio-common/tmpfile.c: Moved to ...
diff --git a/posix/regex.c b/posix/regex.c
index 1435a809aa..bf85cbd4c2 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -297,7 +297,7 @@ init_syntax_once ()
 # endif /* emacs */
 
 /* Integer type for pointers.  */
-# if !defined _LIBC
+# if !defined _LIBC && !defined HAVE_UINTPTR_T
 typedef unsigned long int uintptr_t;
 # endif