Merge pull request #581

10ae003 isblank doesn't need a special case test (Howard Chu)
a090ee9 Fix 3edbf57b62 (Howard Chu)

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)

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