From: Bruno Haible <bruno@clisp.org>
Date: Sat, 17 Jun 2006 20:02:16 +0000 (+0000)
Subject: Tweak for FreeBSD.
X-Git-Tag: cvs-readonly~2350
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=b6a9beebe9a5e2b989b88b18b39efd81ab657463;p=gnulib.git

Tweak for FreeBSD.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a9a54771d..90d4ebd43 100644
--- 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 ab59dce0a..d7f743125 100644
--- 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 3e673b37e..0989ca86a 100644
--- 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 33a443cf8..c33e31588 100644
--- 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__)