Major updates integration from all upstreams

2018-09-18 14:33:53 -07:00
parent 0c8fa56a02 0e0f5e4ea7
commit 9feb4b9e08
396 changed files with 25517 additions and 6854 deletions
--- a/src/crypto/equihash.cpp
+++ b/src/crypto/equihash.cpp
@@ -54,7 +54,7 @@
 #define __BYTE_ORDER    BYTE_ORDER
 #endif
 */
-EhSolverCancelledException solver_cancelled;
+static EhSolverCancelledException solver_cancelled;

 template<unsigned int N, unsigned int K>
 int Equihash<N,K>::InitialiseState(eh_HashState& base_state)