diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-12 14:44:18 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-12 14:44:18 +0200 |
| commit | d75614218b8039e31ffe513c8fa8fe5c82235130 (patch) | |
| tree | ada7d1dae107854708c0dc62cdcbc63dd7675dd5 | |
| parent | Merge pull request #603 (diff) | |
| parent | Cleanup symbol clashes, stdlib header (diff) | |
| download | monero-d75614218b8039e31ffe513c8fa8fe5c82235130.tar.xz | |
Merge pull request #605
fcf31f3 Cleanup symbol clashes, stdlib header (Howard Chu)
| -rw-r--r-- | external/unbound/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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 <assert.h> -#if STDC_HEADERS +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif + +#if STDC_HEADERS #include <stddef.h> #endif |