monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 20:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #605

Browse source 
fcf31f3 Cleanup symbol clashes, stdlib header (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-01-12 14:44:18 +02:00
commit d75614218b
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/unbound/CMakeLists.txt vendored
View file

@ -141,7 +141,7 @@ set(common_src
set(compat_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) string(TOUPPER "${symbol}" upper_sym)
if (NOT HAVE_${upper_sym}) if (NOT HAVE_${upper_sym})
list(APPEND compat_src list(APPEND compat_src

5
external/unbound/config.h.cmake.in vendored
View file

@ -781,8 +781,11 @@
#endif #endif
#include <assert.h> #include <assert.h>
#if STDC_HEADERS #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#endif
#if STDC_HEADERS
#include <stddef.h> #include <stddef.h>
#endif #endif