equal
deleted
inserted
replaced
337 |
337 |
338 /* take care of some name clashes on MacOS */ |
338 /* take care of some name clashes on MacOS */ |
339 #if defined(__APPLE__) |
339 #if defined(__APPLE__) |
340 #define GetString OTTD_GetString |
340 #define GetString OTTD_GetString |
341 #define DrawString OTTD_DrawString |
341 #define DrawString OTTD_DrawString |
342 #define Random OTTD_Random |
|
343 #define CloseConnection OTTD_CloseConnection |
342 #define CloseConnection OTTD_CloseConnection |
344 #endif /* __APPLE */ |
343 #endif /* __APPLE__ */ |
345 |
|
346 #if defined(__AMIGA__) |
|
347 /* it seems AmigaOS already have a Point declared */ |
|
348 #define Point OTTD_AMIGA_POINT |
|
349 #endif |
|
350 |
344 |
351 #if !defined(STRGEN) |
345 #if !defined(STRGEN) |
352 /* In strgen error is not fatal and returns */ |
346 /* In strgen error is not fatal and returns */ |
353 void NORETURN CDECL error(const char *str, ...); |
347 void NORETURN CDECL error(const char *str, ...); |
354 #else |
348 #else |