mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 09:40:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95 from ElementsProject/fix-91-32-bit

Browse source 
Fix #91 32 bit build
This commit is contained in:
Christian Decker 2016-11-16 13:03:56 +01:00 • committed by GitHub
commit 1126499a10
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -247,7 +247,7 @@ ccan/ccan/cdump/tools/cdump-enumstr: ccan/ccan/cdump/tools/cdump-enumstr.o $(CDU
libsecp256k1.a: secp256k1/libsecp256k1.la libsecp256k1.a: secp256k1/libsecp256k1.la
secp256k1/libsecp256k1.la: secp256k1/libsecp256k1.la:
cd secp256k1 && ./autogen.sh && ./configure --enable-static=yes --enable-shared=no --enable-tests=no --enable-experimental=yes --enable-module-ecdh=yes --libdir=`pwd`/.. cd secp256k1 && ./autogen.sh && ./configure CC="$(CC)" --enable-static=yes --enable-shared=no --enable-tests=no --enable-experimental=yes --enable-module-ecdh=yes --libdir=`pwd`/..
$(MAKE) -C secp256k1 install-exec $(MAKE) -C secp256k1 install-exec
lightning.pb-c.c lightning.pb-c.h: lightning.proto lightning.pb-c.c lightning.pb-c.h: lightning.proto

6
daemon/json.c
View file

@ -45,9 +45,9 @@ bool json_tok_u64(const char *buffer, const jsmntok_t *tok,
uint64_t *num) uint64_t *num)
{ {
char *end; 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) if (end != buffer + tok->end)
return false; return false;
@ -55,7 +55,7 @@ bool json_tok_u64(const char *buffer, const jsmntok_t *tok,
*num = l; *num = l;
/* Check for overflow */ /* Check for overflow */
if (l == ULONG_MAX && errno == ERANGE) if (l == ULLONG_MAX && errno == ERANGE)
return false; return false;
if (*num != l) if (*num != l)