From 14b12efa4a0dc8a1f25c24024801d6cdec344816 Mon Sep 17 00:00:00 2001 From: bjarni Date: Wed, 22 Mar 2006 13:06:50 +0000 Subject: (svn r4019) -Fix: [OSX] stopped using iconv for 10.2.8, since it was added in 10.3 this have the sideeffect that 10.2.8 will still have the "failure to save with certain chars in the filename bug", but at least it can compile again --- unix.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'unix.c') diff --git a/unix.c b/unix.c index 291e90110..29ddec090 100644 --- a/unix.c +++ b/unix.c @@ -43,8 +43,6 @@ ULONG __stack = (1024*1024)*2; // maybe not that much is needed actually ;) #endif #if defined(__APPLE__) - #include - #include #if defined(WITH_SDL) //the mac implementation needs this file included in the same file as main() #include @@ -606,12 +604,15 @@ void CSleep(int milliseconds) #endif // __AMIGA__ } -#ifdef __APPLE__ +#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3) /* FYI: This is not thread-safe. Assumptions: - the 'from' charset is ISO-8859-15 - the 'to' charset is either the same, or UTF-8 +NOTE: iconv was added in OSX 10.3. 10.2.x will still have the invalid char issues. There aren't any easy fix for this */ +#include +#include const char *convert_to_fs_charset(const char *filename) { static char statout[1024], statin[1024]; -- cgit v1.2.3-54-g00ecf