Tweak for Solaris 2.5.1.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8c9454d5631cb4393e5865b91dc637ee03721381..a9a54771d23405af8887687719aae9824abc0af9 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-17  Bruno Haible  <bruno@clisp.org>
+
+       * stdint_.h (_UINT8_T, _UINT32_T, _UINT64_T): New macros. Fixes a
+       problem on Solaris 2.5.1.
+
 2006-06-16  Eric Blake  <ebb9@byu.net>
 
        * unsetenv.c [!defined errno]: Assume errno.h declares errno.

diff --git a/lib/stdint_.h b/lib/stdint_.h
index 5ac8ce8716ac8e483fc9a76b5d7472f7883d85e9..ab59dce0a4d6a485decaf3ea0437dd787b93c955 100644 (file)
--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -77,6 +77,7 @@ typedef signed char    int8_t;
 #endif
 #if !@HAVE_UINT8_T@
 typedef unsigned char  uint8_t;
+# define _UINT8_T /* avoid collision with Solaris 2.5.1 <pthread.h> */
 #endif
 
 #if !@HAVE_INT16_T@
@@ -91,6 +92,7 @@ typedef int            int32_t;
 #endif
 #if !@HAVE_UINT32_T@
 typedef unsigned int   uint32_t;
+# define _UINT32_T /* avoid collision with Solaris 2.5.1 <pthread.h> */
 #endif
 
 #if @HAVE_INT64_T@
@@ -115,6 +117,7 @@ typedef unsigned long      uint64_t;
 #  define _STDINT_H_HAVE_UINT64 1
 # elif @HAVE_LONG_LONG_64BIT@
 typedef unsigned long long uint64_t;
+#  define _UINT64_T /* avoid collision with Solaris 2.5.1 <pthread.h> */
 #  define _STDINT_H_HAVE_UINT64 1
 # elif defined _MSC_VER
 typedef unsigned __int64   uint64_t;