From a090ee97f99a217f12c330c56f4dd66c76272142 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 31 Dec 2015 05:31:42 +0000 Subject: [PATCH 1/2] Fix 3edbf57b62feeaba1f31683f24b9d76d75e03902 The test for isblank was being ignored --- external/unbound/config.h.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/unbound/config.h.cmake.in b/external/unbound/config.h.cmake.in index c64c3bab..861020ec 100644 --- a/external/unbound/config.h.cmake.in +++ b/external/unbound/config.h.cmake.in @@ -216,7 +216,7 @@ #cmakedefine HAVE_IPHLPAPI_H /* Define to 1 if you have the `isblank' function. */ -#undef HAVE_ISBLANK +#cmakedefine HAVE_ISBLANK /* Define to 1 if you have the `kill' function. */ #cmakedefine HAVE_KILL From 10ae0032d81ac9b9a87f7f2ac4a2e64a587283b9 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 31 Dec 2015 05:34:29 +0000 Subject: [PATCH 2/2] isblank doesn't need a special case test --- external/unbound/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index 4edb5123..3a87745b 100644 --- a/external/unbound/CMakeLists.txt +++ b/external/unbound/CMakeLists.txt @@ -141,7 +141,7 @@ set(common_src set(compat_src) -foreach (symbol IN ITEMS ctime_r gmtime_r inet_aton inet_ntop inet_pton malloc memcmp memmove snprintf strlcat strlcpy strptime explicit_bzero arc4random arc4random_uniform sha512 reallocarray) +foreach (symbol IN ITEMS ctime_r gmtime_r inet_aton inet_ntop inet_pton isblank malloc memcmp memmove snprintf strlcat strlcpy strptime explicit_bzero arc4random arc4random_uniform sha512 reallocarray) string(TOUPPER "${symbol}" upper_sym) if (NOT HAVE_${upper_sym}) list(APPEND compat_src @@ -168,11 +168,6 @@ elseif (WIN32) compat/getentropy_win.c) endif () -if (NOT HAVE_ISBLANK) - list(APPEND compat_src - compat/isblank.c) -endif () - if (NOT HAVE_GETADDRINFO) list(APPEND compat_src compat/fake-rfc2553.c)