Tweak for FreeBSD.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a9a54771d23405af8887687719aae9824abc0af9..90d4ebd432dd238f199f0368370fa57bf27a528d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-17  Bruno Haible  <bruno@clisp.org>
+
+       * stdint_.h [FreeBSD >= 5]: Don't include <sys/inttypes.h>.
+
 2006-06-17  Bruno Haible  <bruno@clisp.org>
 
        * stdint_.h (_UINT8_T, _UINT32_T, _UINT64_T): New macros. Fixes a

diff --git a/lib/stdint_.h b/lib/stdint_.h
index ab59dce0a4d6a485decaf3ea0437dd787b93c955..d7f74312531b92d0d9351f3b36bec0fda4a98b0c 100644 (file)
--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -30,7 +30,7 @@
 #include <limits.h>
 
 /* Get those types that are already defined in other system include files.  */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
 #if defined(__OpenBSD__)

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 3e673b37e60961eb3abd0b857b1d722c44586851..0989ca86a38f221ba4f44297bcfd5dd8e65af780 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-17  Bruno Haible  <bruno@clisp.org>
+
+       * stdint.m4 (gl_STDINT_H) [FreeBSD >= 5]: Don't include
+       <sys/inttypes.h>.
+
 2006-06-16  Eric Blake  <ebb9@byu.net>
 
        * rmdir-errno.m4 (gl_FUNC_FMDIR_NOTEMPTY): Assume errno.h declares

diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 33a443cf843580ebd0babd051431e39195ed0821..c33e31588665fab18663afbf7da759c92917a37c 100644 (file)
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -87,7 +87,7 @@ typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1];
   dnl created in the build directory.
   other_includes='
 /* Get those types that are already defined in other system include files.  */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
 #if defined(__OpenBSD__)