cpp/openttd-patchpack/source Changeset - r947:94f6b865b768

Changeset - r947:94f6b865b768

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

darkvater - 19 years ago 2005-01-08 23:59:49
darkvater@openttd.org

(svn r1437) -Fix: Safetileadd preprocessor magic is the same as for GCC and no longer extern

2 files changed with 3 insertions and 7 deletions:

macros.h

misc.c

0 comments (0 inline, 0 general)

macros.h

➞

Show inline comments

@@ @@ -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))

misc.c

➞

Show inline comments

@@ @@ -730,7 +730,7 @@ int FindFirstBit(uint32 value) @@
+}
-extern uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line)
 uint SafeTileAdd(uint tile, int add, const char *exp, const char *file, int line)
+{
 	uint x = TileX(tile) + (signed char)(add & 0xFF);
 	uint y = TileY(tile) + ((((0x8080 + add)>>8) & 0xFF) - 0x80);

0 comments (0 inline, 0 general)