diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-06 05:35:50 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-06 05:35:50 +0000 |
commit | 5da2dce5247994ac7405b1dbfec7eaebc3cc1586 (patch) | |
tree | 2f471eff60065325039c8a9cd4f9c98654c4caa1 /src/main.cpp | |
parent | 479c99022e0e65ac525b45d3a18599726c00cc03 (diff) | |
parent | 607739befb6d4a647f03ed049b12222b1530f43c (diff) | |
download | bitcoin-5da2dce5247994ac7405b1dbfec7eaebc3cc1586.tar.xz |
Merge branch '0.4.x' into 0.5.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 5f98d49530..be4d487208 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3022,7 +3022,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 |