Merge branch 'dev' of https://github.com/veruscoin/veruscoin into dev

2018-05-27 20:00:18 -07:00
parent c6e2184378 7b339838ea
commit b89966b0d3
9 changed files with 54 additions and 12 deletions
--- a/src/pow/tromp/equi_miner.h
+++ b/src/pow/tromp/equi_miner.h
@@ -25,7 +25,13 @@
 #include <assert.h>

 typedef uint16_t u16;
+#ifdef _WIN32
+typedef unsigned long long u64;
+#elif __linux__
 typedef uint64_t u64;
+#else
+typedef unsigned long u64;
+#endif

 #ifdef EQUIHASH_TROMP_ATOMIC
 #include <atomic>