Skip to content

Commit df840de

Browse files
tholenstlaanwj
authored andcommitted
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.
1 parent 285cf7a commit df840de

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "init.h"
1111

1212
#include "addrman.h"
13-
#include "db.h"
1413
#include "checkpoints.h"
1514
#include "main.h"
1615
#include "miner.h"
@@ -20,6 +19,7 @@
2019
#include "ui_interface.h"
2120
#include "util.h"
2221
#ifdef ENABLE_WALLET
22+
#include "db.h"
2323
#include "wallet.h"
2424
#include "walletdb.h"
2525
#endif

src/miner.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
#include "core.h"
99
#include "main.h"
1010
#include "net.h"
11+
#ifdef ENABLE_WALLET
1112
#include "wallet.h"
12-
13+
#endif
1314
//////////////////////////////////////////////////////////////////////////////
1415
//
1516
// BitcoinMiner

src/net.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "addrman.h"
1313
#include "chainparams.h"
1414
#include "core.h"
15-
#include "db.h"
1615
#include "ui_interface.h"
1716

1817
#ifdef WIN32

src/rpcmining.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55

66
#include "rpcserver.h"
77
#include "chainparams.h"
8-
#include "db.h"
98
#include "init.h"
109
#include "net.h"
1110
#include "main.h"
1211
#include "miner.h"
12+
#ifdef ENABLE_WALLET
13+
#include "db.h"
1314
#include "wallet.h"
14-
15+
#endif
1516
#include <stdint.h>
1617

1718
#include "json/json_spirit_utils.h"

src/test/miner_tests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "miner.h"
55
#include "uint256.h"
66
#include "util.h"
7-
#include "wallet.h"
87

98
#include <boost/test/unit_test.hpp>
109

src/test/test_bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33

44

5-
#include "db.h"
65
#include "main.h"
76
#include "txdb.h"
87
#include "ui_interface.h"
98
#include "util.h"
109
#ifdef ENABLE_WALLET
10+
#include "db.h"
1111
#include "wallet.h"
1212
#endif
1313

0 commit comments

Comments
 (0)