Merged compat.h and helper.h

spoutn1k · Jan 30, 2021 · 126d8bc · 126d8bc
1 parent e347fc0
commit 126d8bc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/compat.h b/src/compat.h
diff --git a/src/helper.h b/src/helper.h
@@ -11,6 +11,18 @@ namespace fs = std::filesystem;
 #define NOINLINE
 #endif
 
+#if defined(_OPENMP) && defined(_WINDOWS)
+#define OMP_FOR_INDEX int
+#else
+#define OMP_FOR_INDEX std::vector<World::Coordinates>::size_type
+#endif
+
+#ifdef _WINDOWS
+#define FSEEK fseek
+#else
+#define FSEEK fseeko
+#endif
+
 #define CHUNKSIZE 16
 #define REGIONSIZE 32
 #define MIN_TERRAIN_HEIGHT 0

diff --git a/src/png.h b/src/png.h
@@ -1,7 +1,7 @@
 #ifndef DRAW_PNG_H_
 #define DRAW_PNG_H_
 
-#include "./compat.h"
+#include "./helper.h"
 #include <filesystem>
 #include <logger.hpp>
 #include <map>

diff --git a/src/worldloader.h b/src/worldloader.h
@@ -2,7 +2,6 @@
 #define WORLDLOADER_H_
 
 #include "./colors.h"
-#include "./compat.h"
 #include "./helper.h"
 #include <cstdlib>
 #include <filesystem>