Make bitcoin compile without wallet if "db_cxx.h" is not present #3442

pull tholenst wants to merge 2 commits into bitcoin:master from tholenst:nodbcxx changing 6 files +7 −7

tholenst commented at 8:46 PM on December 18, 2013: contributor

The compile didn't work with --disable-wallet before when berkeleydb (in particular, "db_cxx.h") wasn't present. I brainlessly moved all the #include "db.h" into #ifdef ENABLE_WALLET blocks. Now it works.
Moved includes of "db.h" into #ifdef ENABLE_WALLET blocks ec9fe7486a

in src/test/miner_tests.cpp:None in ec9fe7486a outdated

   3 | @@ -4,7 +4,9 @@
   4 |  #include "miner.h"
   5 |  #include "uint256.h"
   6 |  #include "util.h"
   7 | +#ifdef ENABLE_WALLET

laanwj commented at 8:54 PM on December 18, 2013:

miner_tests.cpp shouldn't need wallet.h at all

in src/net.cpp:None in ec9fe7486a outdated

  11 | @@ -12,7 +12,9 @@
  12 |  #include "addrman.h"
  13 |  #include "chainparams.h"
  14 |  #include "core.h"
  15 | +#ifdef ENABLE_WALLET
  16 |  #include "db.h"

laanwj commented at 8:55 PM on December 18, 2013:

Why are we including db.h in net.cpp? Sure this is needed at all?

laanwj commented at 8:55 PM on December 18, 2013: member

ACK apart from above nits
Fixed laanwj comments: removed the includes alltogether in net.cpp and
miner_tests.cpp
1ad0c90025
BitcoinPullTester commented at 9:48 PM on December 18, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/1ad0c9002573d498dbc8f81961d40ae459e6e93c for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj commented at 9:47 AM on December 19, 2013: member

Committed via df840de5daef60a253e4d84d14ff72bb7188a6c0
laanwj closed this on Dec 19, 2013
DrahtBot locked this on Sep 8, 2021

Contributors

tholenst

laanwj

BitcoinPullTester