From eb272b0eb671d19873a6e2b2da37bcebc908d6dc Mon Sep 17 00:00:00 2001
From: Asher Dawes <asher.dawes@gmail.com>
Date: Thu, 24 May 2018 18:05:13 -0700
Subject: [PATCH 1/2] Cleaned up Travis config

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d7c14c3e6..aba91579a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,8 +61,8 @@ script:
 after_script:
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account
   --key-file AUTH_KEY.json; fi
-- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/komodo-build && cp $KOMODO_EXEC_SET
-  src/komodo-build && cd src && tar -czvf $COMPRESSED_BUILD komodo-build; fi
+- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/$KOMODO_BUILD_DIR && cp $KOMODO_EXEC_SET
+  src/$KOMODO_BUILD_DIR && cd src && tar -czvf $COMPRESSED_BUILD $KOMODO_BUILD_DIR; fi
 - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/;
   fi
 notifications:

From 52cf66e138eb09f82b408b70ace4bc4149d2068c Mon Sep 17 00:00:00 2001
From: David Dawes <davidd@remitly.com>
Date: Thu, 24 May 2018 20:28:26 -0700
Subject: [PATCH 2/2] Add conditional compiulation for Windows fix.

---
 src/crypto/haraka.h | 4 ++++
 src/miner.cpp       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/crypto/haraka.h b/src/crypto/haraka.h
index 203f8fbf6..1cb5ea662 100644
--- a/src/crypto/haraka.h
+++ b/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];
diff --git a/src/miner.cpp b/src/miner.cpp
index 2c2d414c8..ef41e6db0 100644
--- a/src/miner.cpp
+++ b/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;
                 }