From 8d92ff2ed3fa1039661e5f60590a1e698528c8fb Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Mon, 31 Aug 2015 14:22:41 -0400 Subject: [PATCH] FS-7966: fix msvc 2015 ldns build --- libs/win32/ldns/ldns-lib/config.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/win32/ldns/ldns-lib/config.h b/libs/win32/ldns/ldns-lib/config.h index 08afdec1e9..58463456b3 100644 --- a/libs/win32/ldns/ldns-lib/config.h +++ b/libs/win32/ldns/ldns-lib/config.h @@ -263,6 +263,9 @@ #define inline #endif +#if _MSC_VER >= 1900 +#include +#else /* Define to `short' if does not define. */ #undef int16_t @@ -284,9 +287,6 @@ /* Define to 'int' if not defined */ #undef socklen_t -/* Define to `int' if does not define. */ -#define ssize_t int - /* Define to `unsigned short' if does not define. */ #define uint16_t unsigned short @@ -303,6 +303,11 @@ #define int8_t char +#endif +/* Define to `int' if does not define. */ +#define ssize_t int + + #include #include //#include @@ -356,6 +361,10 @@ #ifdef _MSC_VER #if _MSC_VER < 1900 #define snprintf _snprintf +#else +#ifndef HAVE_ISBLANK +#define HAVE_ISBLANK +#endif #endif #define vsnprintf _vsnprintf #define strcasecmp _stricmp