Skip to content

Commit 126d8bc

Browse files
committed
Merged compat.h and helper.h
1 parent e347fc0 commit 126d8bc

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/compat.h

-11
This file was deleted.

src/helper.h

+12
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ namespace fs = std::filesystem;
1111
#define NOINLINE
1212
#endif
1313

14+
#if defined(_OPENMP) && defined(_WINDOWS)
15+
#define OMP_FOR_INDEX int
16+
#else
17+
#define OMP_FOR_INDEX std::vector<World::Coordinates>::size_type
18+
#endif
19+
20+
#ifdef _WINDOWS
21+
#define FSEEK fseek
22+
#else
23+
#define FSEEK fseeko
24+
#endif
25+
1426
#define CHUNKSIZE 16
1527
#define REGIONSIZE 32
1628
#define MIN_TERRAIN_HEIGHT 0

src/png.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef DRAW_PNG_H_
22
#define DRAW_PNG_H_
33

4-
#include "./compat.h"
4+
#include "./helper.h"
55
#include <filesystem>
66
#include <logger.hpp>
77
#include <map>

src/worldloader.h

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define WORLDLOADER_H_
33

44
#include "./colors.h"
5-
#include "./compat.h"
65
#include "./helper.h"
76
#include <cstdlib>
87
#include <filesystem>

0 commit comments

Comments
 (0)