Hi Bruno, Does this patch look okay to you?
-- Mark ChangeLog entry: * lib/stdint_.h: A POSIX conforming <inttypes.h> already includes a superset of <stdint.h> on some platforms like SGI for both c89 and c99, but only provide <stdint.h> for c99. Avoid including <stdint.h> if everything works with just <inttypes.h>. Reported by "Mark D. Baushke" <[EMAIL PROTECTED]>. * m4/stdint.h: Ditto. Index: lib/stdint_.h =================================================================== RCS file: /sources/gnulib/gnulib/lib/stdint_.h,v retrieving revision 1.17 diff -u -p -r1.17 stdint_.h --- lib/stdint_.h 17 Jun 2006 20:02:16 -0000 1.17 +++ lib/stdint_.h 22 Jun 2006 12:22:15 -0000 @@ -55,7 +55,7 @@ But note that <sys/int_types.h> contains only the type definitions! */ # include <sys/inttypes.h> #endif -#if (defined(__hpux) || defined(_AIX)) && @HAVE_INTTYPES_H@ +#if (defined(__hpux) || defined(_AIX) || defined(__sgi)) && @HAVE_INTTYPES_H@ /* HP-UX 10 <inttypes.h> has nearly everything, except UINT_LEAST8_MAX, UINT_FAST8_MAX, PTRDIFF_MIN, PTRDIFF_MAX. */ /* AIX 4 <inttypes.h> has nearly everything, except INTPTR_MIN, INTPTR_MAX, @@ -64,7 +64,9 @@ #endif #if @HAVE_STDINT_H@ /* Other systems may have an incomplete <stdint.h>. */ -# include @FULL_PATH_STDINT_H@ +# if !defined(__sgi) || [EMAIL PROTECTED]@ +# include @FULL_PATH_STDINT_H@ +# endif #endif /* 7.18.1.1. Exact-width integer types */ Index: m4/stdint.m4 =================================================================== RCS file: /sources/gnulib/gnulib/m4/stdint.m4,v retrieving revision 1.7 diff -u -p -r1.7 stdint.m4 --- m4/stdint.m4 19 Jun 2006 11:27:00 -0000 1.7 +++ m4/stdint.m4 22 Jun 2006 12:22:15 -0000 @@ -102,11 +102,13 @@ typedef int array [2 * (POW63 != 0 && PO #if defined(__sun) && HAVE_SYS_INTTYPES_H # include <sys/inttypes.h> #endif -#if (defined(__hpux) || defined(_AIX)) && HAVE_INTTYPES_H +#if (defined(__hpux) || defined(_AIX) || defined(__sgi)) && HAVE_INTTYPES_H # include FULL_PATH_INTTYPES_H #endif #if HAVE_STDINT_H -# include FULL_PATH_STDINT_H +# if !defined(__sgi) || !HAVE_INTTYPES_H +# include FULL_PATH_STDINT_H +# endif #endif ' gl_STDINT_CHECK_TYPES(