diff options
| author | glx <glx@openttd.org> | 2018-12-09 02:28:14 +0100 |
|---|---|---|
| committer | glx22 <glx22@users.noreply.github.com> | 2018-12-27 18:09:16 +0100 |
| commit | c540d7244531d501f16b485a3e45e358f98853be (patch) | |
| tree | 4d270f06b2aa9b4f796d4828e5bfaf3c09cdd4b1 /src/strings.cpp | |
| parent | 8890926b0d1069aec7ef53fd84868a7a3ca02c05 (diff) | |
| download | openttd-c540d7244531d501f16b485a3e45e358f98853be.tar.xz | |
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
Diffstat (limited to 'src/strings.cpp')
| -rw-r--r-- | src/strings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index 164d8a3c9..2cc3a23be 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1786,7 +1786,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) strecpy(_config_language_file, c_file, lastof(_config_language_file)); SetCurrentGrfLangID(_current_language->newgrflangid); -#ifdef WIN32 +#ifdef _WIN32 extern void Win32SetCurrentLocaleName(const char *iso_code); Win32SetCurrentLocaleName(_current_language->isocode); #endif @@ -1837,7 +1837,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) /* Win32 implementation in win32.cpp. * OS X implementation in os/macosx/macos.mm. */ -#if !(defined(WIN32) || defined(__APPLE__)) +#if !(defined(_WIN32) || defined(__APPLE__)) /** * Determine the current charset based on the environment * First check some default values, after this one we passed ourselves @@ -1865,7 +1865,7 @@ const char *GetCurrentLocale(const char *param) } #else const char *GetCurrentLocale(const char *param); -#endif /* !(defined(WIN32) || defined(__APPLE__)) */ +#endif /* !(defined(_WIN32) || defined(__APPLE__)) */ int CDECL StringIDSorter(const StringID *a, const StringID *b) { |