diff options
| author | darkvater <darkvater@openttd.org> | 2005-01-08 23:59:49 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2005-01-08 23:59:49 +0000 |
| commit | 528e6d973ed86a3923d6fdbadd2e02c749394d80 (patch) | |
| tree | cd709b86f9915b58053a87706ee56bc0d69305f3 /macros.h | |
| parent | b2063e21504045df55e3dd3d74c2e5668a8844e4 (diff) | |
| download | openttd-528e6d973ed86a3923d6fdbadd2e02c749394d80.tar.xz | |
(svn r1437) -Fix: Safetileadd preprocessor magic is the same as for GCC and no longer extern
Diffstat (limited to 'macros.h')
| -rw-r--r-- | macros.h | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -81,16 +81,12 @@ enum { #define TILE_ASSERT(x) assert( TILE_MASK(x) == (x) ); -extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line); +uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line); #if !defined(_DEBUG) # define TILE_ADD(x,y) ((x)+(y)) #else -# if defined(__GNUC__) -# define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ", " #y, __FILE__, __LINE__)) -# else -# define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ## ", " ## #y, __FILE__, __LINE__)) -# endif +# define TILE_ADD(x,y) (SafeTileAdd((x),(y), #x ", " #y, __FILE__, __LINE__)) #endif #define TILE_ADDXY(tile, x, y) TILE_ADD(tile, TILE_XY(x,y)) |