From b87c2fe9dc2ec40cdbd9a247a8642d1b48a47761 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 1 Jan 2015 09:12:28 -0700 Subject: [PATCH 1/3] Fix for gitian windows compiling --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 694f77fe2..7808c61ce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1588,7 +1588,7 @@ unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const CBlockH unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock) { - uint retarget = DIFF_DGW; + unsigned int retarget = DIFF_DGW; if (!TestNet()) { if (pindexLast->nHeight + 1 >= 34140) retarget = DIFF_DGW; From 2ad2b57c12f066c6f1a10027168c83dcbb5f1332 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 1 Jan 2015 09:47:45 -0700 Subject: [PATCH 2/3] Fix for gitian windows compiling --- contrib/gitian-descriptors/gitian-win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 73e394187..ac1a26c23 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -83,7 +83,7 @@ script: | make $MAKEOPTS make deploy make install-strip - cp -f darkcoin-*setup*.exe $BINDIR/ + #cp -f darkcoin-*setup*.exe $BINDIR/ unset LD_PRELOAD unset FAKETIME done # for BITS in From f46ec0db80c719f00094b35774dbf74a87697ea8 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 1 Jan 2015 10:46:18 -0700 Subject: [PATCH 3/3] Change minversion to 70046 --- src/clientversion.h | 2 +- src/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/clientversion.h b/src/clientversion.h index 39cf585a7..364debf36 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -13,7 +13,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 11 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 1 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/version.h b/src/version.h index 86ce9970f..b8782b6dd 100644 --- a/src/version.h +++ b/src/version.h @@ -33,7 +33,7 @@ static const int PROTOCOL_VERSION = 70052; static const int INIT_PROTO_VERSION = 209; // disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 70052; //70046 +static const int MIN_PEER_PROTO_VERSION = 70046 // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this