diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-17 09:05:07 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-17 09:05:07 +0000 |
| commit | 506061360a9f00edf1656dc2ae9d08d7700f0072 (patch) | |
| tree | 4b32402998d253b51c567bebeb8265e5712f5735 | |
| parent | 3ba638b59a0b210f4469b17adcd455e4e3db4658 (diff) | |
| parent | 6247c53528eae6fd534f22cb5b603dd7546e9502 (diff) | |
| download | bitcoin-506061360a9f00edf1656dc2ae9d08d7700f0072.tar.xz | |
Merge branch '0.4.x' into 0.5.x
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 32b1ea0e8b..2c94a5337f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1271,7 +1271,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) } if (vtx[0].GetValueOut() > GetBlockValue(pindex->nHeight, nFees)) - return error("ConnectBlock() : coinbase pays too much (actual=%lld vs limit=%lld)", (long long)vtx[0].GetValueOut(), (long long)GetBlockValue(pindex->nHeight, nFees)); + return error("ConnectBlock() : coinbase pays too much (actual=%"PRI64d" vs limit=%"PRI64d")", vtx[0].GetValueOut(), GetBlockValue(pindex->nHeight, nFees)); // Update block index on disk without changing it in memory. // The memory index structure will be changed after the db commits. |