diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-06 05:35:58 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-06 05:35:58 +0000 |
commit | 457ff3a437a1b8907ba072001f935a8c67e9193a (patch) | |
tree | 550ee37ab79e5a3adcb0ce51ebd2d3f3a19842a2 /src/main.cpp | |
parent | 700e5a4d86d5180e6bb905c25a9e05695617f445 (diff) | |
parent | 5da2dce5247994ac7405b1dbfec7eaebc3cc1586 (diff) | |
download | bitcoin-457ff3a437a1b8907ba072001f935a8c67e9193a.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Diffstat (limited to 'src/main.cpp')
-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 e78dc49df3..9b93c85caf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3162,7 +3162,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) dPriority += (double)nValueIn * nConf; if (fDebug && GetBoolArg("-printpriority")) - printf("priority nValueIn=%-12I64d nConf=%-5d dPriority=%-20.1f\n", nValueIn, nConf, dPriority); + printf("priority nValueIn=%-12"PRI64d" nConf=%-5d dPriority=%-20.1f\n", nValueIn, nConf, dPriority); } // Priority is sum(valuein * age) / txsize |