Merge pull request #4796

e8b5f0d Move CBlockIndex, CChain and related code out of main (jtimon) 6db83db Decouple CChain from mapBlockIndex (jtimon)
2014-09-29 05:56:57 +02:00
parent a38eaea082 e8b5f0d549
commit bf3a5dd7f0
6 changed files with 461 additions and 442 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,6 +67,7 @@ BITCOIN_CORE_H = \
  allocators.h \
  base58.h \
  bloom.h \
+  chain.h \
  chainparams.h \
  chainparamsbase.h \
  chainparamsseeds.h \
@@ -145,6 +146,7 @@ libbitcoin_server_a_SOURCES = \
  addrman.cpp \
  alert.cpp \
  bloom.cpp \
+  chain.cpp \
  checkpoints.cpp \
  init.cpp \
  leveldbwrapper.cpp \