Tweak for FreeBSD.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a9a5477..90d4ebd 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,9 @@
 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
        problem on Solaris 2.5.1.
 

diff --git a/lib/stdint_.h b/lib/stdint_.h
index ab59dce..d7f7431 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 3e673b3..0989ca8 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 33a443c..c33e315 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__)