diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-17 09:05:19 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-17 09:05:19 +0000 |
| commit | 6d3d1b985f11d5fc102fe7e2d77c9f09131e7ea7 (patch) | |
| tree | 4fb3d3125d29a35021e33f746fd051ca07661830 | |
| parent | 9845499fa14e76161e8b349bb7eccce69578492c (diff) | |
| parent | c3f45b444951b6f752d68876cf9392402a55f080 (diff) | |
| download | bitcoin-6d3d1b985f11d5fc102fe7e2d77c9f09131e7ea7.tar.xz | |
Merge branch '0.6.0.x' into 0.6.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 76b355717e..15140c269f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1369,7 +1369,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. |