Merge pull request #6982

7267843 Globals: Make AcceptBlockHeader static (Fix #6163) (Jorge Timón)
This commit is contained in:
Wladimir J. van der Laan
2015-11-11 12:23:27 +01:00
2 changed files with 3 additions and 5 deletions

View File

@@ -382,7 +382,6 @@ bool TestBlockValidity(CValidationState &state, const CBlock& block, CBlockIndex
/** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */
bool AcceptBlock(const CBlock& block, CValidationState& state, CBlockIndex **pindex, bool fRequested, CDiskBlockPos* dbp);
bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex **ppindex= NULL);
class CBlockFileInfo