Merge pull request #4321

699fe63 remove wrong ; in chainparams.h and order includes (Philip Kaufmann)

Author: laanwj

src/chainparams.h

@@ -6,9 +6,9 @@
 #ifndef BITCOIN_CHAIN_PARAMS_H
 #define BITCOIN_CHAIN_PARAMS_H
 
-#include "uint256.h"
 #include "core.h"
 #include "protocol.h"
+#include "uint256.h"
 
 #include <vector>
 
@@ -62,7 +62,7 @@ class CChainParams
 
     /* Used if GenerateBitcoins is called with a negative number of threads */
     int DefaultMinerThreads() const { return nMinerThreads; }
-    const CBlock& GenesisBlock() const { return genesis; };
+    const CBlock& GenesisBlock() const { return genesis; }
     bool RequireRPCPassword() const { return fRequireRPCPassword; }
     /* Make miner wait to have peers to avoid wasting work */
     bool MiningRequiresPeers() const { return fMiningRequiresPeers; }