stdint module: treat IRIX like OpenBSD.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2c4cf824922b546b656bc5df73cf497f9136c6f6..e92626912eba6a17b15d7f6e0217ee8045f56911 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-23  Bruno Haible  <bruno@clisp.org>
+
+       * stdlib_.h: Treat IRIX like OpenBSD.
+
 2006-06-23  Bruno Haible  <bruno@clisp.org>
 
        * stdlib_.h (UINT8_C, UINT16_C, UINT32_C): Define according to

diff --git a/lib/stdint_.h b/lib/stdint_.h
index 96385e1f40c22ee186ea7740268450934ef93671..3e303ad15a45ac79057512664978fc4c5d083e85 100644 (file)
--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -33,11 +33,13 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__sgi)
   /* In OpenBSD 3.8, <sys/types.h> includes <machine/types.h>, which defines
      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
      <inttypes.h> includes <machine/types.h> and also defines intptr_t and
      uintptr_t.  */
+  /* IRIX 6.5 has <inttypes.h>, and <sys/types.h> defines some of these
+     types as well.  */
 # include <sys/types.h>
 # if @HAVE_INTTYPES_H@
 #  include @FULL_PATH_INTTYPES_H@

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 16bb9c697c0f489e4096a77fff0578dfc1ecf4ee..f9fedd2a9d083127d86efbc92fd45b5d58d68c55 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-23  Bruno Haible  <bruno@clisp.org>
+
+       * stdint.m4 (gl_STDINT_H): Treat IRIX like OpenBSD.
+
 2006-06-22  Simon Josefsson  <jas@extundo.com>
 
        * sockpfaf.m4: Include winsock2.h too, to make it work under

diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 55388fae951d8bb10d613f09e02859b6c5b5663e..733c3c60219c7cb54f6bef8c2e49004c02d0aa4e 100644 (file)
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 7
+# stdint.m4 serial 8
 dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -90,7 +90,7 @@ typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1];
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__sgi)
 # include <sys/types.h>
 # if HAVE_INTTYPES_H
 #  include FULL_PATH_INTTYPES_H