diff options
| author | Patric Stout <truebrain@openttd.org> | 2019-03-10 16:46:19 +0100 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2019-03-11 10:16:00 +0100 |
| commit | 36105841b9d09a3c1cd1a8f7a5bd7b84af135d9f (patch) | |
| tree | 55f8b48637df8c4b15d6a6f569f2b71b71f86106 /src/language.h | |
| parent | 52d7e7d45e0a2a6033942602ed9fdec821a7d2af (diff) | |
| download | openttd-36105841b9d09a3c1cd1a8f7a5bd7b84af135d9f.tar.xz | |
Codechange: ICU_SORT is in reality ICU_I18N (according to their CMake files)
By naming it in a different way, things get a bit confusing.
Especially if we are switching to CMake, which autodetects these
things, we need to use the name the authors of ICU gave it; not
our interpertation of that name.
Diffstat (limited to 'src/language.h')
| -rw-r--r-- | src/language.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/language.h b/src/language.h index ec241dbd8..8df59f74f 100644 --- a/src/language.h +++ b/src/language.h @@ -13,9 +13,9 @@ #define LANGUAGE_H #include "core/smallvec_type.hpp" -#ifdef WITH_ICU_SORT +#ifdef WITH_ICU_I18N #include <unicode/coll.h> -#endif /* WITH_ICU_SORT */ +#endif /* WITH_ICU_I18N */ #include "strings_type.h" static const uint8 CASE_GENDER_LEN = 16; ///< The (maximum) length of a case/gender string. @@ -104,9 +104,9 @@ extern LanguageList _languages; /** The currently loaded language. */ extern const LanguageMetadata *_current_language; -#ifdef WITH_ICU_SORT +#ifdef WITH_ICU_I18N extern icu::Collator *_current_collator; -#endif /* WITH_ICU_SORT */ +#endif /* WITH_ICU_I18N */ bool ReadLanguagePack(const LanguageMetadata *lang); const LanguageMetadata *GetLanguage(byte newgrflangid); |