diff options
author | Riccardo Spagni <ric@spagni.net> | 2015-12-30 13:21:50 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2015-12-30 13:21:50 +0200 |
commit | 91001aa4460a59a42dc14a32c8e90717fd29dbd2 (patch) | |
tree | 68da43b847d517870a2f5c92a6ef13167730945c /external/unbound/compat/snprintf.c | |
parent | Merge pull request #577 (diff) | |
parent | fix missing unbound tests (diff) | |
download | monero-91001aa4460a59a42dc14a32c8e90717fd29dbd2.tar.xz |
Merge pull request #578
3edbf57 fix missing unbound tests (Riccardo Spagni)
2d43ae8 update unbound, fix unbound openssl issue on OS X (Riccardo Spagni)
Diffstat (limited to 'external/unbound/compat/snprintf.c')
-rw-r--r-- | external/unbound/compat/snprintf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/external/unbound/compat/snprintf.c b/external/unbound/compat/snprintf.c index 066355703..97cd7061f 100644 --- a/external/unbound/compat/snprintf.c +++ b/external/unbound/compat/snprintf.c @@ -42,6 +42,7 @@ #ifdef HAVE_STDINT_H #include <stdint.h> #endif +#include <limits.h> /* for test */ /* #define SNPRINTF_TEST 1 */ @@ -428,7 +429,7 @@ print_num_llp(char** at, size_t* left, int* ret, void* value, char buf[PRINT_DEC_BUFSZ]; int negative = 0; int zero = (value == 0); -#if defined(UINTPTR_MAX) && defined(UINT32_MAX) && (UINTPTR_MAX == UINT32_MAX) +#if defined(SIZE_MAX) && defined(UINT32_MAX) && (UINT32_MAX == SIZE_MAX || INT32_MAX == SIZE_MAX) /* avoid warning about upcast on 32bit systems */ unsigned long long llvalue = (unsigned long)value; #else |