aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.h1
-rw-r--r--src/net.cpp3
-rw-r--r--src/net.h1
-rw-r--r--src/qt/test/test_main.cpp1
-rw-r--r--src/rpcnet.cpp2
5 files changed, 2 insertions, 6 deletions
diff --git a/src/main.h b/src/main.h
index f47c9ee825..6f39b6e89d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -102,7 +102,6 @@ extern unsigned int nCoinCacheSize;
static const uint64_t nMinDiskSpace = 52428800;
-class CCoinsDB;
class CBlockTreeDB;
struct CDiskBlockPos;
class CTxUndo;
diff --git a/src/net.cpp b/src/net.cpp
index 4cbd26a563..319f8e6b1c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -41,9 +41,6 @@ using namespace boost;
static const int MAX_OUTBOUND_CONNECTIONS = 8;
-bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
-
-
//
// Global state variables
//
diff --git a/src/net.h b/src/net.h
index 729b1bcd57..3a8cf1ac8f 100644
--- a/src/net.h
+++ b/src/net.h
@@ -49,6 +49,7 @@ void AddressCurrentlyConnected(const CService& addr);
CNode* FindNode(const CNetAddr& ip);
CNode* FindNode(const CService& ip);
CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL);
+bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
void MapPort(bool fUseUPnP);
unsigned short GetListenPort();
bool BindListenPort(const CService &bindAddr, std::string& strError=REF(std::string()));
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index a2adb00327..220da28cfe 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -1,4 +1,3 @@
-#include "bitcoin-config.h"
#if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h"
#endif
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp
index 024f6a09de..63eed09b64 100644
--- a/src/rpcnet.cpp
+++ b/src/rpcnet.cpp
@@ -166,7 +166,7 @@ Value addnode(const Array& params, bool fHelp)
if (strCommand == "onetry")
{
CAddress addr;
- ConnectNode(addr, strNode.c_str());
+ OpenNetworkConnection(addr, NULL, strNode.c_str());
return Value::null;
}