Merge pull request #605
fcf31f3
Cleanup symbol clashes, stdlib header (Howard Chu)
This commit is contained in:
commit
d75614218b
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue