Mercurial > hg > openttd
changeset 5832:d4f51c2fea04 draft
(svn r8398) -Cleanup: Remove WATCOM crud from strgen and map.h include from macros.h as it is no longer needed.
| author | Darkvater <Darkvater@openttd.org> |
|---|---|
| date | Wed, 24 Jan 2007 21:23:35 +0000 |
| parents | 8cb465a840e2 |
| children | bcd4b73b9fd2 |
| files | src/macros.h src/strgen/strgen.cpp |
| diffstat | 2 files changed, 0 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);