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.
This commit is contained in:
Patric Stout
2019-03-10 16:46:19 +01:00
parent 52d7e7d45e
commit 36105841b9
6 changed files with 20 additions and 20 deletions

View File

@@ -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);