Merge branch '0.5.x' into 0.6.0.x

This commit is contained in:
Luke Dashjr
2012-05-06 05:35:58 +00:00
3 changed files with 9 additions and 7 deletions
+1 -1
View File
@@ -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