diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-30 17:18:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-30 17:24:36 +0100 |
| commit | 8d2396c9c41cbd5b8746f48f41180697f58b0681 (patch) | |
| tree | ce5bb77b48ee354790eeae3f0ee3dd19d160b322 /src/version.h | |
| parent | c4761ffb70a9fc38b32f9febcac1434ffb4fee50 (diff) | |
| parent | 71697f97d3f9512f0af934070690c14f1c0d95ea (diff) | |
| download | bitcoin-8d2396c9c41cbd5b8746f48f41180697f58b0681.tar.xz | |
Merge pull request #5164
71697f9 Separate protocol versioning from clientversion (Cory Fields)
Diffstat (limited to 'src/version.h')
| -rw-r--r-- | src/version.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/version.h b/src/version.h index a1e440de24..6ee08c205b 100644 --- a/src/version.h +++ b/src/version.h @@ -5,25 +5,6 @@ #ifndef BITCOIN_VERSION_H #define BITCOIN_VERSION_H -#include "clientversion.h" - -#include <string> -#include <vector> - -// -// client versioning -// - -static const int CLIENT_VERSION = - 1000000 * CLIENT_VERSION_MAJOR - + 10000 * CLIENT_VERSION_MINOR - + 100 * CLIENT_VERSION_REVISION - + 1 * CLIENT_VERSION_BUILD; - -extern const std::string CLIENT_NAME; -extern const std::string CLIENT_BUILD; -extern const std::string CLIENT_DATE; - // // network protocol versioning // @@ -53,7 +34,4 @@ static const int BIP0031_VERSION = 60000; // "mempool" command, enhanced "getdata" behavior starts with this version static const int MEMPOOL_GD_VERSION = 60002; -std::string FormatFullVersion(); -std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments); - #endif // BITCOIN_VERSION_H |