Browse Source

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.
0.10
Thomas Holenstein 11 years ago committed by Wladimir J. van der Laan
parent
commit
df840de5da
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/init.cpp
  2. 3
      src/miner.cpp
  3. 1
      src/net.cpp
  4. 5
      src/rpcmining.cpp
  5. 1
      src/test/miner_tests.cpp
  6. 2
      src/test/test_bitcoin.cpp

2
src/init.cpp

@ -10,7 +10,6 @@ @@ -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 @@ @@ -20,6 +19,7 @@
#include "ui_interface.h"
#include "util.h"
#ifdef ENABLE_WALLET
#include "db.h"
#include "wallet.h"
#include "walletdb.h"
#endif

3
src/miner.cpp

@ -8,8 +8,9 @@ @@ -8,8 +8,9 @@
#include "core.h"
#include "main.h"
#include "net.h"
#ifdef ENABLE_WALLET
#include "wallet.h"
#endif
//////////////////////////////////////////////////////////////////////////////
//
// BitcoinMiner

1
src/net.cpp

@ -12,7 +12,6 @@ @@ -12,7 +12,6 @@
#include "addrman.h"
#include "chainparams.h"
#include "core.h"
#include "db.h"
#include "ui_interface.h"
#ifdef WIN32

5
src/rpcmining.cpp

@ -5,13 +5,14 @@ @@ -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"

1
src/test/miner_tests.cpp

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
#include "miner.h"
#include "uint256.h"
#include "util.h"
#include "wallet.h"
#include <boost/test/unit_test.hpp>

2
src/test/test_bitcoin.cpp

@ -2,12 +2,12 @@ @@ -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

Loading…
Cancel
Save