Conditional compilation so that Windows, Mac and Linux compile from single (messy...

diff --git a/.gitignore b/.gitignore
index e5751db76f351ff8bdd1d92ee4849bff3ddd1d90..ca3d15c12f4b65d4b20230de7fe727bc1a031ad5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ src/univalue/gen
 
 .deps
 .dirstamp
+.idea
 .libs
 .*.swp
 *.*~*

diff --git a/src/crypto/haraka.h b/src/crypto/haraka.h
index 203f8fbf6f9871c339d5dd049afc6a0cc5377dba..1cb5ea662611f3d833b0b2f48bd3a99e883997c2 100644 (file)
--- a/src/crypto/haraka.h
+++ b/src/crypto/haraka.h
@@ -30,7 +30,11 @@ Optimized Implementations for Haraka256 and Haraka512
 \r
 #define NUMROUNDS 5\r
 \r
+#ifdef _WIN32\r
+typedef unsigned long long u64;\r
+#else\r
 typedef unsigned long u64;\r
+#endif\r
 typedef __m128i u128;\r
 \r
 extern u128 rc[40];\r

diff --git a/src/miner.cpp b/src/miner.cpp
index a1419ed964811a656b95565f9c5a1a4d944c6cbf..cfdacb7b55424e9db9708ad27581af0f78640551 100644 (file)
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -1223,7 +1223,11 @@ void static BitcoinMiner_noeq()
 
                 if ((UintToArith256(pblock->nNonce) & mask) == mask)
                 {
+#ifdef _WIN32
+                    printf("%llu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576);
+#else
                     printf("%lu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576);
+#endif
                     break;
                 }