# HG changeset patch
# User Darkvater <darkvater@openttd.org>
# Date 2007-01-24 21:23:35
# Node ID c705f5078c3f2ff869bdb2fb1224bf507242eda4
# Parent  48aa35fbc02edfac71924daf67973100a56d61cb

(svn r8398) -Cleanup: Remove WATCOM crud from strgen and map.h include from macros.h as it is no longer needed.

diff --git a/src/macros.h b/src/macros.h
--- a/src/macros.h
+++ b/src/macros.h
@@ -3,8 +3,6 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "map.h"
-
 /// Fetch n bits starting at bit s from x
 #define GB(x, s, n) (((x) >> (s)) & ((1U << (n)) - 1))
 /// Set n bits starting at bit s in x to d
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -27,14 +27,6 @@
 #define stderr stdout
 #endif /* __MORPHOS__ */
 
-#ifdef __WATCOMC__
-	uint _map_log_x;     // an unpleasant hack required because Watcom is insisting on
-	uint _map_size_x;    // these variables being valid references in map.h
-	uint _map_size_y;
-	uint _map_tile_mask;
-	uint _map_size;
-#endif /* __WATCOMC__ */
-
 /* Compiles a list of strings into a compiled string list */
 
 typedef void (*ParseCmdProc)(char *buf, int value);