diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-09 12:16:15 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-09 12:17:12 +0200 |
| commit | 07b233a1b6e5f15ac7c8b3343088d1b2f3c8e1f1 (patch) | |
| tree | 9ddc6e0b6866df01124b48355bb65deb1fa55411 /src/main.h | |
| parent | 6ff35a0565a6903464d1dfaaf02360d5c5e70c0f (diff) | |
| parent | 18e72167ddfeaea95253b62994c6d64b55b35005 (diff) | |
| download | bitcoin-07b233a1b6e5f15ac7c8b3343088d1b2f3c8e1f1.tar.xz | |
Merge pull request #4148
18e7216 Push cs_mains down in ProcessBlock (Pieter Wuille)
202e019 Move all post-chaintip-change notifications to ActivateBestChain (Pieter Wuille)
4e0eed8 Allow ActivateBestChain to release its lock on cs_main (Pieter Wuille)
77339e5 Get rid of the static chainMostWork (optimization) (Pieter Wuille)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index 23c8660376..98155989a3 100644 --- a/src/main.h +++ b/src/main.h @@ -1079,14 +1079,14 @@ public: /** Find the last common block between this chain and a locator. */ CBlockIndex *FindFork(const CBlockLocator &locator) const; + + /** Find the last common block between this chain and a block index entry. */ + CBlockIndex *FindFork(CBlockIndex *pindex) const; }; /** The currently-connected chain of blocks. */ extern CChain chainActive; -/** The currently best known chain of headers (some of which may be invalid). */ -extern CChain chainMostWork; - /** Global variable that points to the active CCoinsView (protected by cs_main) */ extern CCoinsViewCache *pcoinsTip; |