aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-09-29 09:35:28 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-09-29 09:35:47 +0200
commit76182e7cb62caa93ef24aa657b2b18921f6fc0b7 (patch)
tree05e6df4bd243ab3af606cc1d6c09c5c3e4c80a3d /src
parentbf3a5dd7f0c9da14da1ebcef49d4eeff5fe14419 (diff)
parent775b7b8d70da34029d3f29cbd67e82fbfcd30481 (diff)
downloadbitcoin-76182e7cb62caa93ef24aa657b2b18921f6fc0b7.tar.xz
Merge pull request #4999
775b7b8 LLu is standard, but not portable. use ULL (sinetek)
Diffstat (limited to 'src')
-rw-r--r--src/serialize.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialize.h b/src/serialize.h
index 7f8f933284..68501facf2 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -245,7 +245,7 @@ uint64_t ReadCompactSize(Stream& is)
uint64_t xSize;
READDATA(is, xSize);
nSizeRet = xSize;
- if (nSizeRet < 0x100000000LLu)
+ if (nSizeRet < 0x100000000ULL)
throw std::ios_base::failure("non-canonical ReadCompactSize()");
}
if (nSizeRet > (uint64_t)MAX_SIZE)