diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-06 11:59:53 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-06 12:01:21 +0200 |
| commit | 2f746c6e8a5d10fa2d432de9b43b694f40d5f4a1 (patch) | |
| tree | 79269aacdc5605b430d60a73a20ed2f52397857d /src/miner.h | |
| parent | 149f96c9b0693a61f27016572a12fb21436a442d (diff) | |
| parent | ef8dfe41d1eba0de6d6554e25e658169f97313b5 (diff) | |
| download | bitcoin-2f746c6e8a5d10fa2d432de9b43b694f40d5f4a1.tar.xz | |
Merge pull request #6177
ef8dfe4 Prevent block.nTime from decreasing (Mark Friedenbach)
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.h b/src/miner.h index 777a091967..d690e9447d 100644 --- a/src/miner.h +++ b/src/miner.h @@ -30,6 +30,6 @@ void GenerateBitcoins(bool fGenerate, int nThreads, const CChainParams& chainpar CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn); /** Modify the extranonce in a block */ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); -void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev); +int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev); #endif // BITCOIN_MINER_H |