Merge pull request #470

b1d0c8a blockchain_dump: fix build without berkeley db (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-11-01 14:12:11 +02:00
commit 575af61815
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -31,7 +31,9 @@
#include "cryptonote_core/blockchain.h" #include "cryptonote_core/blockchain.h"
#include "blockchain_db/blockchain_db.h" #include "blockchain_db/blockchain_db.h"
#include "blockchain_db/lmdb/db_lmdb.h" #include "blockchain_db/lmdb/db_lmdb.h"
#ifdef BERKELEY_DB
#include "blockchain_db/berkeleydb/db_bdb.h" #include "blockchain_db/berkeleydb/db_bdb.h"
#endif
#include "blockchain_utilities.h" #include "blockchain_utilities.h"
#include "common/command_line.h" #include "common/command_line.h"
#include "version.h" #include "version.h"
@ -237,11 +239,13 @@ int main(int argc, char* argv[])
db = new BlockchainLMDB(); db = new BlockchainLMDB();
mdb_flags |= MDB_RDONLY; mdb_flags |= MDB_RDONLY;
} }
#ifdef BERKELEY_DB
else if (db_type == "berkeley") else if (db_type == "berkeley")
{ {
db = new BlockchainBDB(); db = new BlockchainBDB();
// can't open readonly due to the way flags are split in db_bdb.cpp // can't open readonly due to the way flags are split in db_bdb.cpp
} }
#endif
else else
{ {
LOG_PRINT_L0("Invalid db type: " << db_type); LOG_PRINT_L0("Invalid db type: " << db_type);