From f6b20a369edc673dda3cbf566d759d3a2e70037a Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 15 Nov 2001 18:27:28 +0000
Subject: Update.

2001-11-15  Jeff Law  <law@redhat.com>

	* posix/regex.c (uintptr_t): Do not provide a definition if the
	system provided one.
---
 ChangeLog     | 5 +++++
 posix/regex.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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
 
-- 
cgit 1.4.1