summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskidd13 <skidd13@openttd.org>2007-12-23 14:06:03 +0000
committerskidd13 <skidd13@openttd.org>2007-12-23 14:06:03 +0000
commitda5d3a7b3b6aa5e4e78e3f3467f9a0aaa881cb6b (patch)
tree3b8f0bec78cdf814451905d5f96daf8fc0ba5d31
parent451abbecb120a9a2042670a06d7a5b2494f5a93c (diff)
downloadopenttd-da5d3a7b3b6aa5e4e78e3f3467f9a0aaa881cb6b.tar.xz
(svn r11687) -Codechange: move some defines to a better place
-rw-r--r--src/core/geometry_type.hpp5
-rw-r--r--src/core/random_func.hpp5
-rw-r--r--src/stdafx.h8
3 files changed, 11 insertions, 7 deletions
diff --git a/src/core/geometry_type.hpp b/src/core/geometry_type.hpp
index f2759ef4d..d6cd225dd 100644
--- 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;
diff --git a/src/core/random_func.hpp b/src/core/random_func.hpp
index a2e0ea984..607d802a8 100644
--- 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
*
diff --git a/src/stdafx.h b/src/stdafx.h
index 90bd721cd..5426eed8a 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -339,14 +339,8 @@ assert_compile(sizeof(uint8) == 1);
#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 */