diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-16 06:55:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-16 06:55:47 +0200 |
| commit | 5dd7318db75db580d602c72a2322df97d8712233 (patch) | |
| tree | e15a3c55d610d8c9e26ac2224d746e8b36a0450a /src/main.h | |
| parent | c1e667222ad7eac6403cd60aab4d5d09ed0ff02d (diff) | |
| parent | 217208a36d210e7d51e405d0e531ac2b75a3a087 (diff) | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
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 d1dc72d5d9..a8deb2b92b 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); |