From 5465b61784ce67e9f7bdc544321afe22e7ef9c1b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 16 Nov 2016 13:34:56 +1030 Subject: [PATCH] json: fix 32-bit build. Assume we have strtoull everywhere (it's C99 and was common before). Fixes: #91 Signed-off-by: Rusty Russell --- daemon/json.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/json.c b/daemon/json.c index c32151103..60f12b438 100644 --- a/daemon/json.c +++ b/daemon/json.c @@ -45,9 +45,9 @@ bool json_tok_u64(const char *buffer, const jsmntok_t *tok, uint64_t *num) { char *end; - unsigned long l; + unsigned long long l; - l = strtoul(buffer + tok->start, &end, 0); + l = strtoull(buffer + tok->start, &end, 0); if (end != buffer + tok->end) return false; @@ -55,7 +55,7 @@ bool json_tok_u64(const char *buffer, const jsmntok_t *tok, *num = l; /* Check for overflow */ - if (l == ULONG_MAX && errno == ERANGE) + if (l == ULLONG_MAX && errno == ERANGE) return false; if (*num != l)