diff options
| author | bjarni <bjarni@openttd.org> | 2007-08-11 15:52:34 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2007-08-11 15:52:34 +0000 |
| commit | 8c5d47d51095c954928d0cb2b6d0946307a88d05 (patch) | |
| tree | 911efe699bec79b316408e9ee8cdbac856b49a07 /src/strings.cpp | |
| parent | 76ab8ab86ca3a7acf0a365b4d1b9311d13e5585b (diff) | |
| download | openttd-8c5d47d51095c954928d0cb2b6d0946307a88d05.tar.xz | |
(svn r10851) -Feature [OSX]: OpenTTD will now pick the same language as finder is set to if no config file is found (ln-)
Diffstat (limited to 'src/strings.cpp')
| -rw-r--r-- | src/strings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index ad902ead4..6916d2aaa 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1237,7 +1237,8 @@ bool ReadLanguagePack(int lang_index) } /* Win32 implementation in win32.cpp. */ -#ifndef WIN32 +/* OS X implementation in os/macosx/macos.mm. */ +#if !(defined(WIN32) || defined(__APPLE__)) /** Determine the current charset based on the environment * First check some default values, after this one we passed ourselves * and if none exist return the value for $LANG @@ -1261,7 +1262,7 @@ const char *GetCurrentLocale(const char *param) return getenv("LANG"); } -#endif /* ifndef WIN32 */ +#endif /* !(defined(WIN32) || defined(__APPLE__)) */ static int CDECL LanguageCompareFunc(const void *a, const void *b) { |