Merge branch 'totalblocksestimate1' of https://github.com/laanwj/bitcoin

2011-06-24 11:17:22 -04:00
parent 77ba3ab99c eade213197
commit c774b16976
2 changed files with 17 additions and 1 deletions
--- a/src/main.h
+++ b/src/main.h
@@ -98,6 +98,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int&
 void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1);
 bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
 bool CheckProofOfWork(uint256 hash, unsigned int nBits);
+int GetTotalBlocksEstimate();
 bool IsInitialBlockDownload();
 std::string GetWarnings(std::string strFor);