Mercurial > hg > bitcoin

changeset 2977:14246fe5426a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch '0.4.x' into 0.5.x
author Luke Dashjr <luke-jr+git@utopios.org>
date Sun, 06 May 2012 05:35:50 +0000
parents 0d7d0201a5af (current diff) 303fa0657007 (diff)
children 846d9bb768eb 76f52a73a43c
files src/db.cpp src/main.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -849,7 +849,7 @@
 
                 //// debug print
                 //printf("LoadWallet  %s\n", wtx.GetHash().ToString().c_str());
-                //printf(" %12I64d  %s  %s  %s\n",
+                //printf(" %12"PRI64d"  %s  %s  %s\n",
                 //    wtx.vout[0].nValue,
                 //    DateTimeStrFormat("%x %H:%M:%S", wtx.GetBlockTime()).c_str(),
                 //    wtx.hashBlock.ToString().substr(0,20).c_str(),
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3022,7 +3022,7 @@
                 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