Merge branch 'conditional' of github.com:VerusCoin/VerusCoin into dev

.gitignore

@@ -47,6 +47,7 @@ src/univalue/gen
 
 .deps
 .dirstamp
+.idea
 .libs
 .*.swp
 *.*~*

src/crypto/haraka.h

@@ -30,7 +30,11 @@ Optimized Implementations for Haraka256 and Haraka512
 
 #define NUMROUNDS 5
 
+#ifdef _WIN32
+typedef unsigned long long u64;
+#else
 typedef unsigned long u64;
+#endif
 typedef __m128i u128;
 
 extern u128 rc[40];

src/miner.cpp

@@ -1228,7 +1228,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;
                 }