diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-17 09:05:13 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-17 09:05:13 +0000 |
| commit | c3f45b444951b6f752d68876cf9392402a55f080 (patch) | |
| tree | 3ea483ecfc76da31ca1cba92cda987d2e7c046df | |
| parent | c510f571dc580c0460b4054d183255c23f370212 (diff) | |
| parent | 506061360a9f00edf1656dc2ae9d08d7700f0072 (diff) | |
| download | bitcoin-c3f45b444951b6f752d68876cf9392402a55f080.tar.xz | |
Merge branch '0.5.x' into 0.6.0.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 5b4b873680..8e9052f0c5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1378,7 +1378,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. |