Fix to placate the Visual Studio(TM) gods.

[rmac] / rmac.h

diff --git a/rmac.h b/rmac.h
index 00dcd3ba49c92cb9d6b6c194076adbe7c94bc4ef..48a6545c6d9ac0849b417d23ecd5a97575675cd2 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -22,6 +22,7 @@
 #if defined(WIN32) || defined(WIN64)
        #include <io.h>
        #include <fcntl.h>
+       #include "dirent_lose.h"
        // Release platform - windows
        #define PLATFORM        "Win32"
        #define _OPEN_FLAGS     _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR
@@ -54,8 +55,19 @@
 
        #endif
 
+       // Ever since Visual Studio... 2017? 2019? the following constants come
+       // defined in the platform SDK, which leads to endless warnings from the
+       // compiler. So let's just put the pacifier on and undef them, sheesh! (No,
+       // we won't rename the defines, we've been here since 1986, Visual Studio
+       // wasn't even a glimpse in the milkman's eyes, if you catch my drift)
+       #undef CONST
+       #undef ERROR
+       #undef TEXT
+
 #else
 
+       #include <dirent.h>
+
        #ifdef __GCCUNIX__
 
        #include <sys/fcntl.h>
@@ -156,20 +168,8 @@
 // Non-target specific stuff
 //
 #include <inttypes.h>
-#include <dirent.h>
 #include "symbol.h"
 
-#if defined(WIN32) || defined(WIN64)
-// Ever since Visual Studio... 2017? 2019? the following constants come defined in the
-// platform SDK, which leads to endless warnings from the compiler. So let's just
-// put the pacifier on and undef them, sheesh! (No, we won't rename the defines,
-// we've been here since 1986, Visual Studio wasn't even a glimpse in the milkman's eyes,
-// if you catch my drift)
-#undef CONST
-#undef ERROR
-#undef TEXT
-#endif
-
 #define BYTE         uint8_t
 #define WORD         uint16_t
 #define LONG         uint32_t