mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11687) -Codechange: move some defines to a better place

release/0.6
skidd13 2007-12-23 14:06:03 +00:00
parent 451abbecb1
commit da5d3a7b3b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/geometry_type.hpp
View File

@ -5,6 +5,11 @@
#ifndef GEOMETRY_TYPE_HPP #ifndef GEOMETRY_TYPE_HPP
#define GEOMETRY_TYPE_HPP #define GEOMETRY_TYPE_HPP
#if defined(__AMIGA__)
/* AmigaOS already has a Point declared */
#define Point OTTD_Point
#endif /* __AMIGA__ */
struct Point { struct Point {
int x; int x;
int y; int y;

5
src/core/random_func.hpp
View File

@ -5,6 +5,11 @@
#ifndef RANDOM_FUNC_HPP #ifndef RANDOM_FUNC_HPP
#define 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 * Warning: DO NOT enable this unless you understand what it does
* *

8
src/stdafx.h
View File

@ -339,14 +339,8 @@ assert_compile(sizeof(uint8) == 1);
#if defined(__APPLE__) #if defined(__APPLE__)
#define GetString OTTD_GetString #define GetString OTTD_GetString
#define DrawString OTTD_DrawString #define DrawString OTTD_DrawString
#define Random OTTD_Random
#define CloseConnection OTTD_CloseConnection #define CloseConnection OTTD_CloseConnection
#endif /* __APPLE */ #endif /* __APPLE__ */
#if defined(__AMIGA__)
/* it seems AmigaOS already have a Point declared */
#define Point OTTD_AMIGA_POINT
#endif
#if !defined(STRGEN) #if !defined(STRGEN)
/* In strgen error is not fatal and returns */ /* In strgen error is not fatal and returns */