(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
This commit is contained in:
bjarni
2006-03-22 13:06:50 +00:00
parent adab6f6438
commit 0b102f0e00
6 changed files with 25 additions and 19 deletions

7
unix.c
View File

@@ -43,8 +43,6 @@ ULONG __stack = (1024*1024)*2; // maybe not that much is needed actually ;)
#endif
#if defined(__APPLE__)
#include <iconv.h>
#include <locale.h>
#if defined(WITH_SDL)
//the mac implementation needs this file included in the same file as main()
#include <SDL.h>
@@ -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 <iconv.h>
#include <locale.h>
const char *convert_to_fs_charset(const char *filename)
{
static char statout[1024], statin[1024];