diff options
| author | Darkvater <darkvater@openttd.org> | 2007-01-24 21:23:35 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2007-01-24 21:23:35 +0000 |
| commit | 9727bb4cfc954b5ecf18a3cf81cbc8c541b14d7d (patch) | |
| tree | 83d80451f979c4ed9bae7e813e15cef726630bf4 | |
| parent | fb5a0ba6dfdd4f518e9ba9b8608f22442eee5309 (diff) | |
| download | openttd-9727bb4cfc954b5ecf18a3cf81cbc8c541b14d7d.tar.xz | |
(svn r8398) -Cleanup: Remove WATCOM crud from strgen and map.h include from macros.h as it is no longer needed.
| -rw-r--r-- | src/macros.h | 2 | ||||
| -rw-r--r-- | src/strgen/strgen.cpp | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/macros.h b/src/macros.h index cd644b579..2471a12f8 100644 --- 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 index c837b3664..e29c0f8d1 100644 --- 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); |