diff options
| author | michi_cc <michi_cc@openttd.org> | 2009-10-04 20:53:22 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2009-10-04 20:53:22 +0000 |
| commit | 10ca710e9883661566ad436d2747044081a5bb5b (patch) | |
| tree | cb5e8967408e2e909cf4116dfb5a4096ce0b3b43 /src/os | |
| parent | 6c7f8fc8b4974a4546190d5c2e9abcdfa74f9382 (diff) | |
| download | openttd-10ca710e9883661566ad436d2747044081a5bb5b.tar.xz | |
(svn r17702) -Change: [OSX] Assure that the minimal OSX version is defined in all cases.
-Codechange: [OSX] Improve conditional defines for OS version dependant code.
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/macosx/macos.h | 4 | ||||
| -rw-r--r-- | src/os/macosx/macos.mm | 13 | ||||
| -rw-r--r-- | src/os/macosx/osx_stdafx.h | 1 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/os/macosx/macos.h b/src/os/macosx/macos.h index 3bdcbe387..247f4427d 100644 --- a/src/os/macosx/macos.h +++ b/src/os/macosx/macos.h @@ -25,6 +25,10 @@ #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 + /* * Functions to show the popup window diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm index 7c67e00c0..88cc71ade 100644 --- a/src/os/macosx/macos.mm +++ b/src/os/macosx/macos.mm @@ -182,21 +182,16 @@ const char *GetCurrentLocale(const char *) /* Since Apple introduced encoding to CString in OSX 10.4 we have to make a few conditions * to get the right code for the used version of OSX. */ -#if (MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_4) - /* 10.4 can compile both versions just fine and will select the correct version at runtime based - * on the version of OSX at execution time. */ +#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) if (MacOSVersionIsAtLeast(10, 4, 0)) { [ preferredLang getCString:retbuf maxLength:32 encoding:NSASCIIStringEncoding ]; } else #endif { - [ preferredLang getCString:retbuf maxLength:32 -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - /* If 10.5+ is used to compile then encoding is needed here. - * If 10.3 or 10.4 is used for compiling then this line is used by 10.3 and encoding should not be present here. */ - encoding:NSASCIIStringEncoding +#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4) + /* maxLength does not include the \0 char in contrast to the call above. */ + [ preferredLang getCString:retbuf maxLength:31 ]; #endif - ]; } return retbuf; } diff --git a/src/os/macosx/osx_stdafx.h b/src/os/macosx/osx_stdafx.h index 3dab349ca..00b9ddb19 100644 --- a/src/os/macosx/osx_stdafx.h +++ b/src/os/macosx/osx_stdafx.h @@ -30,7 +30,6 @@ # error "Compiling 64 bits without _SQ64 set! (or vice versa)" #endif -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 #include <AvailabilityMacros.h> /* Name conflict */ |