From 05cc0f6401bec18f20d0788734c60259a621ca63 Mon Sep 17 00:00:00 2001 From: Grand Nagus Date: Thu, 12 May 2016 19:23:04 -0400 Subject: [PATCH 1/4] updated checkpoints --- src/checkpoints.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 144e493..a398b91 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -29,7 +29,8 @@ static MapCheckpoints mapCheckpoints = ( 474965, uint256("0x000000000000627be2476468199e26aaf5f6309487684716dbeae072921f04d0")) ( 683658, uint256("0x0000000000008c51b5caee62b2f51179e722863981d6f99249a752c7502759f3")) ( 717883, uint256("0x000000000001a968fb7b33e08bc184b3a489661c4e7bc2b77a5ea993a2cef5b7")) - ( 1522343, uint256("c1b1fba522182d3ca27153b6f2621431df35ce9884e42f90c59d5de1e4aa0174")) + ( 1522343, uint256("0xc1b1fba522182d3ca27153b6f2621431df35ce9884e42f90c59d5de1e4aa0174")) + ( 1621000, uint256("0xeff011c0b161ac8af781afc96bb458f682769a421bf2114e39d72795536848dd")) ; static MapCheckpoints mapCheckpointsTestnet = From 414356f3d655e5e0ac412a27ed679da5ca7e769e Mon Sep 17 00:00:00 2001 From: Grand Nagus Date: Thu, 12 May 2016 19:26:14 -0400 Subject: [PATCH 2/4] Fix UPnP --- tekcoin-qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekcoin-qt.pro b/tekcoin-qt.pro index e3a3c4f..c08e35d 100644 --- a/tekcoin-qt.pro +++ b/tekcoin-qt.pro @@ -69,7 +69,7 @@ contains(USE_UPNP, -) { count(USE_UPNP, 0) { USE_UPNP=1 } - DEFINES += USE_UPNP=$$USE_UPNP STATICLIB + DEFINES += USE_UPNP=$$USE_UPNP MINIUPNP_STATICLIB INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc win32:LIBS += -liphlpapi From 9ab91bdbed5a43177bbb5386a12006276f7b710c Mon Sep 17 00:00:00 2001 From: Grand Nagus Date: Thu, 12 May 2016 19:28:23 -0400 Subject: [PATCH 3/4] version 2.4.2 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index c162553..4f5ed0f 100644 --- a/src/version.h +++ b/src/version.h @@ -12,7 +12,7 @@ #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 4 -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_REVISION 2 #define CLIENT_VERSION_BUILD 0 // Converts the parameter X to a string after macro replacement on X has been performed. From f9f12cf14601f622c38d2efddd84dcbb90ef70c7 Mon Sep 17 00:00:00 2001 From: rotzbouf Date: Thu, 23 Feb 2017 20:40:07 +0100 Subject: [PATCH 4/4] Update net.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixing compile error: src/net.cpp:60:1: error: reference to ‘array’ is ambiguous --- src/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index b095aa8..7358249 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -58,7 +58,7 @@ static bool vfLimited[NET_MAX] = {}; static CNode* pnodeLocalHost = NULL; CAddress addrSeenByPeer(CService("0.0.0.0", 0), nLocalServices); uint64 nLocalHostNonce = 0; -array vnThreadsRunning; +boost::array vnThreadsRunning; static std::vector vhListenSocket; CAddrMan addrman;