| author | rubidium |
| Sat, 26 Apr 2008 20:54:56 +0000 | |
| branch | 0.6 |
| changeset 10366 | 960aae8c20e2 |
| parent 8623 | 652df321c912 |
| child 10429 | 1b99254f9607 |
| permissions | -rw-r--r-- |
|
3016
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
1 |
/* $Id$ */ |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
2 |
|
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
3 |
#ifndef MACOS_STDAFX_H |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
4 |
#define MACOS_STDAFX_H |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
5 |
|
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
6 |
#include <CoreServices/CoreServices.h> |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
7 |
// remove the variables that CoreServices defines, but we define ourselves too |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
8 |
#undef bool |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
9 |
#undef false |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
10 |
#undef true |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
11 |
|
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
12 |
/* Name conflict */ |
|
8623
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
5726
diff
changeset
|
13 |
#define GetTime OTTD_GetTime |
|
3016
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
14 |
|
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
15 |
#define SL_ERROR OSX_SL_ERROR |
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
16 |
|
|
c63fb93fa1a0
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
bjarni
parents:
diff
changeset
|
17 |
#endif /* MACOS_STDAFX_H */ |