Merge with Bitcoin v0.6.3

[novacoin.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index fec63cb..29efa06 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,6 +1,6 @@
 // Copyright (c) 2012 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_VERSION_H
 #define BITCOIN_VERSION_H
 
@@ -10,10 +10,11 @@
 // client versioning
 //
 
-static const int CLIENT_VERSION_MAJOR       =  0;
-static const int CLIENT_VERSION_MINOR       =  6;
-static const int CLIENT_VERSION_REVISION    =  2;
-static const int CLIENT_VERSION_BUILD       = 0;
+// These need to be macro's, as version.cpp's voodoo requires it
+#define CLIENT_VERSION_MAJOR       0
+#define CLIENT_VERSION_MINOR       6
+#define CLIENT_VERSION_REVISION    3
+#define CLIENT_VERSION_BUILD       0
 
 static const int CLIENT_VERSION =
                            1000000 * CLIENT_VERSION_MAJOR
@@ -25,6 +26,12 @@ extern const std::string CLIENT_NAME;
 extern const std::string CLIENT_BUILD;
 extern const std::string CLIENT_DATE;
 
+// ppcoin version - intended for display purpose ONLY
+#define PPCOIN_VERSION_MAJOR       0
+#define PPCOIN_VERSION_MINOR       1
+#define PPCOIN_VERSION_REVISION    0
+#define PPCOIN_VERSION_BUILD       0
+
 //
 // network protocol versioning
 //
@@ -32,7 +39,7 @@ extern const std::string CLIENT_DATE;
 static const int PROTOCOL_VERSION = 60001;
 
 // earlier versions not supported as of Feb 2012, and are disconnected
-static const int MIN_PROTO_VERSION = 209;
+static const int MIN_PROTO_VERSION = 60001;
 
 // nTime field added to CAddress, starting with this version;
 // if possible, avoid requesting addresses nodes older than this