Mercurial > hg > openttd
changeset 8126:357c22303fd6 draft
(svn r11687) -Codechange: move some defines to a better place
| author | skidd13 <skidd13@openttd.org> |
|---|---|
| date | Sun, 23 Dec 2007 14:06:03 +0000 |
| parents | 9c883f1f7bf2 |
| children | 7bdaba97d085 |
| files | src/core/geometry_type.hpp src/core/random_func.hpp src/stdafx.h |
| diffstat | 3 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/geometry_type.hpp +++ b/src/core/geometry_type.hpp @@ -5,6 +5,11 @@ #ifndef GEOMETRY_TYPE_HPP #define GEOMETRY_TYPE_HPP +#if defined(__AMIGA__) + /* AmigaOS already has a Point declared */ + #define Point OTTD_Point +#endif /* __AMIGA__ */ + struct Point { int x; int y;
--- a/src/core/random_func.hpp +++ b/src/core/random_func.hpp @@ -5,6 +5,11 @@ #ifndef RANDOM_FUNC_HPP #define RANDOM_FUNC_HPP +#if defined(__APPLE__) + /* Apple already has Random declared */ + #define Random OTTD_Random +#endif /* __APPLE__ */ + /************** * Warning: DO NOT enable this unless you understand what it does *
--- a/src/stdafx.h +++ b/src/stdafx.h @@ -339,14 +339,8 @@ #if defined(__APPLE__) #define GetString OTTD_GetString #define DrawString OTTD_DrawString - #define Random OTTD_Random #define CloseConnection OTTD_CloseConnection -#endif /* __APPLE */ - -#if defined(__AMIGA__) - /* it seems AmigaOS already have a Point declared */ - #define Point OTTD_AMIGA_POINT -#endif +#endif /* __APPLE__ */ #if !defined(STRGEN) /* In strgen error is not fatal and returns */