# HG changeset patch # User Bruno Haible # Date 1150572816 0 # Node ID d238fb8227ce3786be71bebb2982e888eb94012a # Parent 8094e7d61c3b92d1dbc0bd019b1808b5e87c9031 Tweak for Solaris 2.5.1. diff --git a/lib/ChangeLog b/lib/ChangeLog --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-06-17 Bruno Haible + + * stdint_.h (_UINT8_T, _UINT32_T, _UINT64_T): New macros. Fixes a + problem on Solaris 2.5.1. + 2006-06-16 Eric Blake * unsetenv.c [!defined errno]: Assume errno.h declares errno. diff --git a/lib/stdint_.h b/lib/stdint_.h --- a/lib/stdint_.h +++ b/lib/stdint_.h @@ -77,6 +77,7 @@ #endif #if !@HAVE_UINT8_T@ typedef unsigned char uint8_t; +# define _UINT8_T /* avoid collision with Solaris 2.5.1 */ #endif #if !@HAVE_INT16_T@ @@ -91,6 +92,7 @@ #endif #if !@HAVE_UINT32_T@ typedef unsigned int uint32_t; +# define _UINT32_T /* avoid collision with Solaris 2.5.1 */ #endif #if @HAVE_INT64_T@ @@ -115,6 +117,7 @@ # 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 */ # define _STDINT_H_HAVE_UINT64 1 # elif defined _MSC_VER typedef unsigned __int64 uint64_t;