diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-03-18 23:14:03 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-04-03 20:22:41 +0200 |
| commit | 52d3a48128b66e731afd54cec7cab0a687d303cf (patch) | |
| tree | ade3bfd91c7e92ed83ea79219ed773fbc009ee0e /src/main.h | |
| parent | 703d64469eb2b607adcd864555b5fe1d981bf51f (diff) | |
| download | bitcoin-52d3a48128b66e731afd54cec7cab0a687d303cf.tar.xz | |
VC2010 compile fixes
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index 16159e18b5..6c81abad56 100644 --- a/src/main.h +++ b/src/main.h @@ -11,6 +11,10 @@ #include "script.h" #include "db.h" +#ifdef WIN32 +#include <io.h> /* for _commit */ +#endif + #include <list> class CBlock; @@ -161,7 +165,7 @@ public: std::string ToString() const { if (IsNull()) - return strprintf("null"); + return "null"; else return strprintf("(nFile=%d, nBlockPos=%d, nTxPos=%d)", nFile, nBlockPos, nTxPos); } @@ -288,7 +292,7 @@ public: std::string ToString() const { std::string str; - str += strprintf("CTxIn("); + str += "CTxIn("; str += prevout.ToString(); if (prevout.IsNull()) str += strprintf(", coinbase %s", HexStr(scriptSig).c_str()); |