diff options
| author | planetmaker <planetmaker@openttd.org> | 2013-07-31 18:50:01 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2013-07-31 18:50:01 +0000 |
| commit | 1024fd3116e0c72955f40328926c1a54f33b44cc (patch) | |
| tree | c30cf2523a9e688c96d2defda05007439426473f | |
| parent | b7441b3a77f68ee2e017d20454615f5a880e9e48 (diff) | |
| download | openttd-1024fd3116e0c72955f40328926c1a54f33b44cc.tar.xz | |
(svn r25643) -Fix (r25480): [OSX] Define version constants before they're used
| -rw-r--r-- | src/os/macosx/macos.h | 26 | ||||
| -rw-r--r-- | src/os/macosx/osx_stdafx.h | 31 |
2 files changed, 31 insertions, 26 deletions
diff --git a/src/os/macosx/macos.h b/src/os/macosx/macos.h index d147dfb0b..16f34a3dc 100644 --- a/src/os/macosx/macos.h +++ b/src/os/macosx/macos.h @@ -12,32 +12,6 @@ #ifndef MACOS_H #define MACOS_H -/* It would seem that to ensure backward compability we have to ensure that we have defined MAC_OS_X_VERSION_10_x everywhere */ -#ifndef MAC_OS_X_VERSION_10_3 -#define MAC_OS_X_VERSION_10_3 1030 -#endif - -#ifndef MAC_OS_X_VERSION_10_4 -#define MAC_OS_X_VERSION_10_4 1040 -#endif - -#ifndef MAC_OS_X_VERSION_10_5 -#define MAC_OS_X_VERSION_10_5 1050 -#endif - -#ifndef MAC_OS_X_VERSION_10_6 -#define MAC_OS_X_VERSION_10_6 1060 -#endif - -#ifndef MAC_OS_X_VERSION_10_7 -#define MAC_OS_X_VERSION_10_7 1070 -#endif - -#ifndef MAC_OS_X_VERSION_10_8 -#define MAC_OS_X_VERSION_10_8 1080 -#endif - - /** Helper function displaying a message the best possible way. */ void ShowMacDialog(const char *title, const char *message, const char *button_label); diff --git a/src/os/macosx/osx_stdafx.h b/src/os/macosx/osx_stdafx.h index ad9c5220c..5adbde179 100644 --- a/src/os/macosx/osx_stdafx.h +++ b/src/os/macosx/osx_stdafx.h @@ -12,6 +12,37 @@ #ifndef MACOS_STDAFX_H #define MACOS_STDAFX_H + +/* It would seem that to ensure backward compability we have to ensure that we have defined MAC_OS_X_VERSION_10_x everywhere */ +#ifndef MAC_OS_X_VERSION_10_3 +#define MAC_OS_X_VERSION_10_3 1030 +#endif + +#ifndef MAC_OS_X_VERSION_10_4 +#define MAC_OS_X_VERSION_10_4 1040 +#endif + +#ifndef MAC_OS_X_VERSION_10_5 +#define MAC_OS_X_VERSION_10_5 1050 +#endif + +#ifndef MAC_OS_X_VERSION_10_6 +#define MAC_OS_X_VERSION_10_6 1060 +#endif + +#ifndef MAC_OS_X_VERSION_10_7 +#define MAC_OS_X_VERSION_10_7 1070 +#endif + +#ifndef MAC_OS_X_VERSION_10_8 +#define MAC_OS_X_VERSION_10_8 1080 +#endif + +#ifndef MAC_OS_X_VERSION_10_9 +#define MAC_OS_X_VERSION_10_9 1090 +#endif + + #define __STDC_LIMIT_MACROS #include <stdint.h> |