X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=1d46851ac2fa766f9e9002e169b29e08b598eac1;hb=a20c0d0f6792acf532309eee2e9f29120c801ee4;hp=18d5dbdd746dcdfcf93c1774272178cb50ac8cf0;hpb=f3f9da868e00008d468eee41432afaff1144ae58;p=novacoin.git diff --git a/src/main.h b/src/main.h index 18d5dbd..1d46851 100644 --- a/src/main.h +++ b/src/main.h @@ -10,6 +10,11 @@ #include "key.h" #include "script.h" #include "db.h" +#include "version.h" + +#ifdef WIN32 +#include /* for _commit */ +#endif #include @@ -26,10 +31,6 @@ class CInv; class CRequestTracker; class CNode; -static const int CLIENT_VERSION = 60006; -static const bool VERSION_IS_BETA = true; -extern const std::string CLIENT_NAME; - static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; @@ -161,7 +162,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 +289,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());