From fcf31f3ff3c5325b767f1ff9e0c41de6881fbdc2 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 4 Jan 2016 21:01:22 +0000 Subject: [PATCH] Cleanup symbol clashes, stdlib header --- external/unbound/CMakeLists.txt | 2 +- external/unbound/config.h.cmake.in | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt index 459ba860b..839b21c70 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 isblank 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 memmove snprintf strlcat strlcpy strptime explicit_bzero arc4random arc4random_uniform reallocarray) string(TOUPPER "${symbol}" upper_sym) if (NOT HAVE_${upper_sym}) list(APPEND compat_src diff --git a/external/unbound/config.h.cmake.in b/external/unbound/config.h.cmake.in index 9658c8693..87c282f25 100644 --- a/external/unbound/config.h.cmake.in +++ b/external/unbound/config.h.cmake.in @@ -781,8 +781,11 @@ #endif #include -#if STDC_HEADERS +#ifdef HAVE_STDLIB_H #include +#endif + +#if STDC_HEADERS #include #endif