diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-07 10:51:57 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-07 10:51:57 -0400 |
| commit | 5a3dea451d8a53ec87cbd7a7d1405a970fb1b263 (patch) | |
| tree | 84a47b03eb615c8d8a4c3df2f7d0dbb0ad698dc0 /src/main.h | |
| parent | f92f022edaa2f14951b9ce8304a304ff9693ae16 (diff) | |
| parent | 83f4cd156e9d52bd7c4351336dfa4806a43ee4e4 (diff) | |
| download | bitcoin-5a3dea451d8a53ec87cbd7a7d1405a970fb1b263.tar.xz | |
Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin into unique_coinbase
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 427067bc94..c400145d01 100644 --- a/src/main.h +++ b/src/main.h @@ -94,7 +94,7 @@ bool ProcessMessages(CNode* pfrom); bool SendMessages(CNode* pto, bool fSendTrickle); void GenerateBitcoins(bool fGenerate, CWallet* pwallet); CBlock* CreateNewBlock(CReserveKey& reservekey); -void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce, int64& nPrevTime); +void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); 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); |