diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-10 14:36:16 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-10 14:36:16 +0300 |
| commit | cce238a499b58302b5009f7f10a6c42ace506faa (patch) | |
| tree | 84ecc4eaedb14842976cd0fc4a5f3eb2f0a19527 | |
| parent | 7e79b563cec10180d1e8598d2eb139ed9426bee8 (diff) | |
iOS is much like MacOSX
| -rw-r--r-- | sal/osl/unx/nlsupport.c | 6 | ||||
| -rw-r--r-- | sal/osl/unx/osxlocale.cxx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c index dcee27c8d..563aae980 100644 --- a/sal/osl/unx/nlsupport.c +++ b/sal/osl/unx/nlsupport.c @@ -35,13 +35,13 @@ defined(FREEBSD) || defined(MACOSX) || defined(IOS) || defined(OPENBSD) || \ defined(DRAGONFLY) #include <pthread.h> -#ifndef MACOSX +#if !defined(MACOSX) && !defined(IOS) #include <locale.h> #include <langinfo.h> #else #include <osl/module.h> #include <osl/thread.h> -#endif /* !MACOSX */ +#endif /* !MACOSX && !IOS */ #endif /* LINUX || SOLARIS || NETBSD || MACOSX || IOS */ #include <string.h> @@ -855,7 +855,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) return RTL_TEXTENCODING_DONTKNOW; } -#ifdef MACOSX +#if defined(MACOSX) || defined(IOS) #include "system.h" /* OS X locale discovery function */ diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx index 26434ef4e..37b34b200 100644 --- a/sal/osl/unx/osxlocale.cxx +++ b/sal/osl/unx/osxlocale.cxx @@ -33,7 +33,9 @@ #include <assert.h> #include <premac.h> +#ifndef IOS #include <CoreServices/CoreServices.h> +#endif #include <CoreFoundation/CoreFoundation.h> #include <postmac.h> |