From 663224c2324d64134f8587fe77d1d787c0353b20 Mon Sep 17 00:00:00 2001 From: Eric Lombrozo Date: Mon, 7 Jan 2013 08:07:51 -0800 Subject: Removed net.cpp's dependency on init.h. Added explicit include of main.h in init.cpp, changed include of init.h to include of main.h in net.cpp. Added function registration for net.cpp in init.cpp's network initialization. Removed protocol.cpp's dependency on main.h. TODO: Remove main.h include in net.cpp. --- src/init.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 48fd5ae97..1eee4d247 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -3,11 +3,12 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "init.h" +#include "main.h" #include "txdb.h" #include "walletdb.h" #include "bitcoinrpc.h" #include "net.h" -#include "init.h" #include "util.h" #include "ui_interface.h" #include "checkpoints.h" @@ -569,6 +570,10 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 6: network initialization + SetProcessMessagesHandler(ProcessMessages); + SetSendMessagesHandler(SendMessages); + SetStartShutdownHandler(StartShutdown); + int nSocksVersion = GetArg("-socks", 5); if (nSocksVersion != 4 && nSocksVersion != 5) return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion)); -- cgit v1.2.3