From 9727bb4cfc954b5ecf18a3cf81cbc8c541b14d7d Mon Sep 17 00:00:00 2001 From: Darkvater Date: Wed, 24 Jan 2007 21:23:35 +0000 Subject: [PATCH] (svn r8398) -Cleanup: Remove WATCOM crud from strgen and map.h include from macros.h as it is no longer needed. --- src/macros.h | 2 -- src/strgen/strgen.cpp | 8 -------- 2 files changed, 10 deletions(-) diff --git a/src/macros.h b/src/macros.h index cd644b579a..2471a12f83 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 c837b3664d..e29c0f8d1a 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);