From 432fbd7a1a71ab5a91a8cfab57fad74fda9389bb Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 7 Jan 2014 14:09:47 +0100 Subject: platform.h: undef HAVE_STRCHRNUL only on correct versions of FreeBSD Signed-off-by: Denys Vlasenko --- include/platform.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/platform.h b/include/platform.h index cfc802907..2899a9093 100644 --- a/include/platform.h +++ b/include/platform.h @@ -385,10 +385,6 @@ typedef unsigned smalluint; # undef HAVE_STRVERSCMP #endif -#if defined(__dietlibc__) -# undef HAVE_STRCHRNUL -#endif - #if defined(__WATCOMC__) # undef HAVE_DPRINTF # undef HAVE_GETLINE @@ -434,10 +430,21 @@ typedef unsigned smalluint; # undef HAVE_UNLOCKED_LINE_OPS #endif -#if defined(__FreeBSD__) || defined(__APPLE__) +#if defined(__dietlibc__) # undef HAVE_STRCHRNUL #endif +#if defined(__APPLE__) +# undef HAVE_STRCHRNUL +#endif + +#if defined(__FreeBSD__) +# include +# if __FreeBSD_version < 1000029 +# undef HAVE_STRCHRNUL +# endif +#endif + #if defined(__NetBSD__) # define HAVE_GETLINE 1 /* Recent NetBSD versions have getline() */ #endif -- cgit v1.2.3-55-g6feb From 8e0ad2647a9725f189ad880b437619667e81343c Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 8 Jan 2014 15:10:54 +0100 Subject: Another FreeBSD fix from Matthias Andree Signed-off-by: Denys Vlasenko --- include/platform.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/platform.h b/include/platform.h index 2899a9093..bd11ad69a 100644 --- a/include/platform.h +++ b/include/platform.h @@ -415,7 +415,7 @@ typedef unsigned smalluint; /* These BSD-derived OSes share many similarities */ #if (defined __digital__ && defined __unix__) \ || defined __APPLE__ \ - || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ + || defined __OpenBSD__ || defined __NetBSD__ # undef HAVE_CLEARENV # undef HAVE_FDATASYNC # undef HAVE_GETLINE @@ -439,9 +439,18 @@ typedef unsigned smalluint; #endif #if defined(__FreeBSD__) -# include +# undef HAVE_CLEARENV +# undef HAVE_FDATASYNC +# undef HAVE_MNTENT_H +# undef HAVE_PTSNAME_R +# undef HAVE_SYS_STATFS_H +# undef HAVE_SIGHANDLER_T +# undef HAVE_STRVERSCMP +# undef HAVE_XTABS +# undef HAVE_UNLOCKED_LINE_OPS +# include # if __FreeBSD_version < 1000029 -# undef HAVE_STRCHRNUL +# undef HAVE_STRCHRNUL /* FreeBSD added strchrnul() between 1000028 and 1000029 */ # endif #endif -- cgit v1.2.3-55-g6feb