From 30ced44ecea820d0e199c5f2acec7f8c2d8716e5 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 19 Jun 2006 18:22:03 +0000
Subject: [PATCH] * lib/autoconf/types.m4 (_AC_TYPE_UNSIGNED_INT): Solaris
 2.5.1 needs _UINT8_T and _UINT64_T defines as well, to avoid clashes with
 system headers.  Report by Bruno Haible.

---
 ChangeLog             | 6 ++++++
 lib/autoconf/types.m4 | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b35824d0..3e8b21db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* lib/autoconf/types.m4 (_AC_TYPE_UNSIGNED_INT): Solaris 2.5.1
+	needs _UINT8_T and _UINT64_T defines as well, to avoid clashes
+	with system headers.  Report by Bruno Haible.
+
 2006-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* config/config.guess, config/config.sub: Sync from upstream.
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 6257040d..3fcc37bb 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -620,7 +620,7 @@ AC_DEFUN([_AC_TYPE_UNSIGNED_INT],
   case $ac_cv_c_uint$1_t in #(
   no|uint$1_t) ;; #(
   *)
-    m4_if([$1], 32,
+    m4_bmatch([$1], [^\(8\|32\|64\)$],
       [AC_DEFINE([_UINT$1_T], 1,
 	 [Define for Solaris 2.5.1 so the uint$1_t typedef from
 	  <sys/synch.h>, <pthread.h>, or <semaphore.h> is not used.