remove left-overs from gulrak filesystem

Chia-Network · Nov 11, 2020 · 19af397 · 19af397
1 parent f85948d
commit 19af397
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 26 deletions.
diff --git a/src/disk.hpp b/src/disk.hpp
@@ -29,12 +29,6 @@
 
 using namespace std::chrono_literals; // for operator""min;
 
-#ifdef _WIN32
-#include <windows.h>
-#define _HAS_STD_BYTE 0
-#define NOMINMAX
-#endif
-
 #include "chia_filesystem.hpp"
 
 #include "./bits.hpp"

diff --git a/src/phase1.hpp b/src/phase1.hpp
@@ -36,10 +36,6 @@
 #include <memory>
 #include <mutex>
 
-// Gulrak filesystem brings in Windows headers that cause some issues with std
-#define _HAS_STD_BYTE 0
-#define NOMINMAX
-
 #include "chia_filesystem.hpp"
 
 #include "calculate_bucket.hpp"

diff --git a/src/plotter_disk.hpp b/src/plotter_disk.hpp
@@ -32,10 +32,6 @@
 #include <vector>
 #include <memory>
 
-// Gulrak filesystem brings in Windows headers that cause some issues with std
-#define _HAS_STD_BYTE 0
-#define NOMINMAX
-
 #include "chia_filesystem.hpp"
 
 #include "calculate_bucket.hpp"

diff --git a/src/quicksort.hpp b/src/quicksort.hpp
@@ -22,10 +22,6 @@
 #include <vector>
 #include <memory>
 
-// Gulrak filesystem brings in Windows headers that cause some issues with std
-#define _HAS_STD_BYTE 0
-#define NOMINMAX
-
 #include "util.hpp"
 
 namespace QuickSort {

diff --git a/src/sort_manager.hpp b/src/sort_manager.hpp
@@ -21,10 +21,6 @@
 #include <string>
 #include <vector>
 
-// Gulrak filesystem brings in Windows headers that cause some issues with std
-#define _HAS_STD_BYTE 0
-#define NOMINMAX
-
 #include "chia_filesystem.hpp"
 
 #include "./bits.hpp"

diff --git a/src/threading.hpp b/src/threading.hpp
@@ -6,6 +6,10 @@
 #define CHIAPOS_THREADING_HPP
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#define STRICT
+#include <windows.h>
 #elif __APPLE__
 #include <unistd.h>
 #include <dispatch/dispatch.h>

diff --git a/src/uniformsort.hpp b/src/uniformsort.hpp
@@ -21,10 +21,6 @@
 #include <string>
 #include <vector>
 
-// Gulrak filesystem brings in Windows headers that cause some issues with std
-#define _HAS_STD_BYTE 0
-#define NOMINMAX
-
 #include "./disk.hpp"
 #include "./util.hpp"