diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-08-07 08:49:43 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-08-07 08:49:43 -0700 |
| commit | adfb71fa6bad2bf6be4ac461ae13f8801dec7164 (patch) | |
| tree | 0942091b17f9d5cae0b05c4cb90c6d24fe01239f | |
| parent | 37341048a9359cbaccf15ff3716b2e1ae55f4916 (diff) | |
| download | infinitytier-adfb71fa6bad2bf6be4ac461ae13f8801dec7164.tar.gz infinitytier-adfb71fa6bad2bf6be4ac461ae13f8801dec7164.zip | |
Compile for for TRACE, remove old TESTNET cruft.
| -rw-r--r-- | make-linux.mk | 4 | ||||
| -rw-r--r-- | make-mac.mk | 4 | ||||
| -rw-r--r-- | node/Network.cpp | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/make-linux.mk b/make-linux.mk index c2678cf1..e9df9fa6 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -15,10 +15,6 @@ ifeq ($(ZT_AUTO_UPDATE),1) DEFS+=-DZT_AUTO_UPDATE endif -ifeq ($(ZT_USE_TESTNET),1) - DEFS+=-DZT_USE_TESTNET -endif - # Enable SSE-optimized Salsa20 DEFS+=-DZT_SALSA20_SSE diff --git a/make-mac.mk b/make-mac.mk index 05214d66..e2992d6c 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -20,10 +20,6 @@ ifeq ($(ZT_AUTO_UPDATE),1) DEFS+=-DZT_AUTO_UPDATE endif -ifeq ($(ZT_USE_TESTNET),1) - DEFS+=-DZT_USE_TESTNET -endif - # Enable SSE-optimized Salsa20 DEFS+=-DZT_SALSA20_SSE diff --git a/node/Network.cpp b/node/Network.cpp index 43565e9f..23b32946 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -103,7 +103,6 @@ SharedPtr<Network> Network::newInstance(const RuntimeEnvironment *renv,NodeConfi nw->_restoreState(); nw->requestConfiguration(); } catch ( ... ) { - TRACE("exception in network setup thread in _restoreState() or requestConfiguration()!"); nw->_lastConfigUpdate = 0; // call requestConfiguration() again } |