From 5a66f890445cfc741a1441dc76cdb46d5fead53a Mon Sep 17 00:00:00 2001 From: Stan Date: Wed, 2 Dec 2020 16:47:28 +0000 Subject: [PATCH] Update ICU on Windows to 68.1 with the v140_xp toolset. - Remove the last usage of the MACRO "TRUE" as it's deprecated and replace it by its value "1" the == operator is overloaded to return a UBool(int8_t) refs 9b9a96382c - Remove two unused DLLs - Update and add EOL to headers. Refs #3004 This was SVN commit r24314. --- source/i18n/L10n.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/i18n/L10n.cpp b/source/i18n/L10n.cpp index c54fd3b9e5..a896c521d4 100644 --- a/source/i18n/L10n.cpp +++ b/source/i18n/L10n.cpp @@ -201,7 +201,7 @@ void L10n::ReevaluateCurrentLocaleAndReload() else { GetDictionaryLocale(locale, currentLocale); - currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == TRUE; + currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == 1; useLongStrings = false; } LoadDictionaryForCurrentLocale();