From 2f81dc16b2882388a04d2e0569c4e033614910fe Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 25 Nov 2016 21:57:35 +0100 Subject: [PATCH] fix autoconf usage, force my OSX build to use it --- src/platform.h | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/src/platform.h b/src/platform.h index ee19e0723..765b5c4a7 100644 --- a/src/platform.h +++ b/src/platform.h @@ -23,6 +23,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define LOMEM #endif +#undef USE_AUTOCONF +#define USE_AUTOCONF + #ifdef _MSC_VER # define VC_EXTRALEAN # define WIN32_LEAN_AND_MEAN @@ -78,7 +81,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # define _CRTDBG_MAP_ALLOC #endif -#elif defined __GLIBC__ +#undef USE_AUTOCONF +#elif __GNUC__ +#include +#if __GLIBC__ >= 2 # define _POSIX_C_SOURCE 200809L # undef _DEFAULT_SOURCE # define _DEFAULT_SOURCE @@ -88,11 +94,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # define HAVE_SYS_STAT_MKDIR # define HAVE_STRDUP # define HAVE_UNISTD_H -#elif defined SOLARIS -# define _SYS_PROCSET_H -#undef _XOPEN_SOURCE -# define _XOPEN_SOURCE -#else +# undef USE_AUTOCONF +#endif +#endif + +#ifdef USE_AUTOCONF #include #endif @@ -164,9 +170,8 @@ typedef unsigned char _Bool; #if !defined(HAVE__STRDUP) #if defined(HAVE_STRDUP) +#undef _strdup #define _strdup(a) strdup(a) -#else -#define _strdup(a) lcp_strdup(a) #endif #endif @@ -176,19 +181,5 @@ typedef unsigned char _Bool; #endif #endif -#if !defined(HAVE__STRCMPL) -#if defined(HAVE_STRCMPL) -#define _strcmpl(a, b) strcmpl(a, b) -#elif defined(HAVE__STRICMP) -#define _strcmpl(a, b) _stricmp(a, b) -#elif defined(HAVE_STRICMP) -#define _strcmpl(a, b) stricmp(a, b) -#elif defined(HAVE_STRCASECMP) -#define _strcmpl(a, b) strcasecmp(a, b) -#else -#define _strcmpl(a, b) lcp_strcmpl(a, b) -#endif -#endif - #endif