From 10ca710e9883661566ad436d2747044081a5bb5b Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sun, 4 Oct 2009 20:53:22 +0000 Subject: (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. --- src/os/macosx/macos.mm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/os/macosx/macos.mm') 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; } -- cgit v1.2.3-54-g00ecf