From b6a9beebe9a5e2b989b88b18b39efd81ab657463 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 17 Jun 2006 20:02:16 +0000 Subject: [PATCH] Tweak for FreeBSD. --- lib/ChangeLog | 4 ++++ lib/stdint_.h | 2 +- m4/ChangeLog | 5 +++++ m4/stdint.m4 | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index a9a54771d2..90d4ebd432 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-06-17 Bruno Haible + + * stdint_.h [FreeBSD >= 5]: Don't include . + 2006-06-17 Bruno Haible * stdint_.h (_UINT8_T, _UINT32_T, _UINT64_T): New macros. Fixes a diff --git a/lib/stdint_.h b/lib/stdint_.h index ab59dce0a4..d7f7431253 100644 --- a/lib/stdint_.h +++ b/lib/stdint_.h @@ -30,7 +30,7 @@ #include /* Get those types that are already defined in other system include files. */ -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4) # include #endif #if defined(__OpenBSD__) diff --git a/m4/ChangeLog b/m4/ChangeLog index 3e673b37e6..0989ca86a3 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-06-17 Bruno Haible + + * stdint.m4 (gl_STDINT_H) [FreeBSD >= 5]: Don't include + . + 2006-06-16 Eric Blake * rmdir-errno.m4 (gl_FUNC_FMDIR_NOTEMPTY): Assume errno.h declares diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 33a443cf84..c33e315886 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 #endif #if defined(__OpenBSD__) -- 2.30.2