aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Holenstein <thomas.holenstein@gmail.com>2013-12-18 20:46:43 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-19 10:46:41 +0100
commitdf840de5daef60a253e4d84d14ff72bb7188a6c0 (patch)
treec9953453f4edcce02a5d18685ffd66e6e489693b /src
parent285cf7a1a6cb660b57cbc75f63e49736b51d705e (diff)
Make bitcoin compile without wallet if "db_cxx.h" is not present
Moved includes of "db.h" into #ifdef ENABLE_WALLET blocks or remove them.
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp2
-rw-r--r--src/miner.cpp3
-rw-r--r--src/net.cpp1
-rw-r--r--src/rpcmining.cpp5
-rw-r--r--src/test/miner_tests.cpp1
-rw-r--r--src/test/test_bitcoin.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/init.cpp b/src/init.cpp
index a0b9f89f23..28f6e08f9a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -10,7 +10,6 @@
#include "init.h"
#include "addrman.h"
-#include "db.h"
#include "checkpoints.h"
#include "main.h"
#include "miner.h"
@@ -20,6 +19,7 @@
#include "ui_interface.h"
#include "util.h"
#ifdef ENABLE_WALLET
+#include "db.h"
#include "wallet.h"
#include "walletdb.h"
#endif
diff --git a/src/miner.cpp b/src/miner.cpp
index edfbbf5736..21a9fa256b 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -8,8 +8,9 @@
#include "core.h"
#include "main.h"
#include "net.h"
+#ifdef ENABLE_WALLET
#include "wallet.h"
-
+#endif
//////////////////////////////////////////////////////////////////////////////
//
// BitcoinMiner
diff --git a/src/net.cpp b/src/net.cpp
index 6ae749c657..ab39be60b5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -12,7 +12,6 @@
#include "addrman.h"
#include "chainparams.h"
#include "core.h"
-#include "db.h"
#include "ui_interface.h"
#ifdef WIN32
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index b81433120e..1a8462fdea 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -5,13 +5,14 @@
#include "rpcserver.h"
#include "chainparams.h"
-#include "db.h"
#include "init.h"
#include "net.h"
#include "main.h"
#include "miner.h"
+#ifdef ENABLE_WALLET
+#include "db.h"
#include "wallet.h"
-
+#endif
#include <stdint.h>
#include "json/json_spirit_utils.h"
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ea6abb7e9a..8e3091d555 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -4,7 +4,6 @@
#include "miner.h"
#include "uint256.h"
#include "util.h"
-#include "wallet.h"
#include <boost/test/unit_test.hpp>
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index a4592fe803..667bdfb62e 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -2,12 +2,12 @@
-#include "db.h"
#include "main.h"
#include "txdb.h"
#include "ui_interface.h"
#include "util.h"
#ifdef ENABLE_WALLET
+#include "db.h"
#include "wallet.h"
#endif