.equr overhaul part 4: handle equrundef (and the other permutations of the directive)

[rmac] / rmac.h

diff --git a/rmac.h b/rmac.h
index 985d85190ad06f76fdff9d08276ca8b5d08a815e..a23acafd77a251bf76c4254c3c01af917c995448 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -39,7 +39,6 @@
        #define STRINGIZE(x) STRINGIZE_HELPER(x)
        #define WARNING(desc) __pragma(message(__FILE__ "(" STRINGIZE(__LINE__) ") : Warning: " #desc))
        #define inline __inline
-
        // usage:
        // WARNING(FIXME: Code removed because...)
 
@@ -159,6 +158,17 @@
 #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
@@ -295,9 +305,11 @@ enum
        OPT_CLR_DX        = 7,
        OPT_ADDA_ADDQ     = 8,
        OPT_ADDA_LEA      = 9,
+       OPT_56K_SHORT     = 10,
+       OPT_56K_AUTO_LONG = 11,
        OPT_COUNT,                  // Dummy, used to count number of optimisation switches
     // These will be unaffected by "Oall"
-       OPT_PC_RELATIVE   = 11,         // Enforce PC relative
+       OPT_PC_RELATIVE   = 30,         // Enforce PC relative
     OPT_COUNT_ALL               // Dummy, used to count all switches
 };