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.
try
Thomas Holenstein
11 years ago
committed by
Wladimir J. van der Laan
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
6 changed files with
7 additions and
7 deletions
-
src/init.cpp
-
src/miner.cpp
-
src/net.cpp
-
src/rpcmining.cpp
-
src/test/miner_tests.cpp
-
src/test/test_bitcoin.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 |
|
|
|
|
|
@ -8,8 +8,9 @@ |
|
|
|
#include "core.h" |
|
|
|
#include "main.h" |
|
|
|
#include "net.h" |
|
|
|
#ifdef ENABLE_WALLET |
|
|
|
#include "wallet.h" |
|
|
|
|
|
|
|
#endif |
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
|
|
|
// BitcoinMiner
|
|
|
|
|
|
@ -12,7 +12,6 @@ |
|
|
|
#include "addrman.h" |
|
|
|
#include "chainparams.h" |
|
|
|
#include "core.h" |
|
|
|
#include "db.h" |
|
|
|
#include "ui_interface.h" |
|
|
|
|
|
|
|
#ifdef WIN32 |
|
|
|
|
|
@ -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" |
|
|
|
|
|
@ -4,7 +4,6 @@ |
|
|
|
#include "miner.h" |
|
|
|
#include "uint256.h" |
|
|
|
#include "util.h" |
|
|
|
#include "wallet.h" |
|
|
|
|
|
|
|
#include <boost/test/unit_test.hpp> |
|
|
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|