Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 In file included from modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.cpp:27: modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:82:28: error: use of undeclared identifier 'TRUE' isAccessible = TRUE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:87:28: error: use of undeclared identifier 'FALSE' isAccessible = FALSE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:96:28: error: use of undeclared identifier 'TRUE' isAccessible = TRUE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:101:28: error: use of undeclared identifier 'FALSE' isAccessible = FALSE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' return TRUE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' return FALSE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' return TRUE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' return FALSE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' return TRUE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' return FALSE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' return TRUE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:129:16: error: use of undeclared identifier 'FALSE' return FALSE; ^ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:149:12: error: use of undeclared identifier 'TRUE' return TRUE; ^ In file included from DerivedSources/WebCore/unified-sources/UnifiedSource-3c72abbe-47.cpp:3: modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp:242:45: error: use of undeclared identifier 'TRUE' ucnv_setFallback(m_converter.get(), TRUE); ^ --- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-07-17 10:21:33 UTC +++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h @@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text // Ensure chunk offset is well formed if computed offset exceeds int32_t range. ASSERT(offset < std::numeric_limits::max()); text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; - isAccessible = TRUE; + isAccessible = true; return true; } if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { text->chunkOffset = text->chunkLength; - isAccessible = FALSE; + isAccessible = false; return true; } } else { @@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text // Ensure chunk offset is well formed if computed offset exceeds int32_t range. ASSERT(offset < std::numeric_limits::max()); text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; - isAccessible = TRUE; + isAccessible = true; return true; } if (nativeIndex <= 0 && !text->chunkNativeStart) { text->chunkOffset = 0; - isAccessible = FALSE; + isAccessible = false; return true; } } --- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-07-17 10:21:33 UTC +++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { // Already inside the buffer. Set the new offset. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return TRUE; + return true; } if (index >= length && uText->chunkNativeLimit == length) { // Off the end of the buffer, but we can't get it. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return FALSE; + return false; } } else { if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { // Already inside the buffer. Set the new offset. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return TRUE; + return true; } if (!index && !uText->chunkNativeStart) { // Already at the beginning; can't go any farther. uText->chunkOffset = 0; - return FALSE; + return false; } } @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i uText->nativeIndexingLimit = uText->chunkLength; - return TRUE; + return true; } static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) @@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) { if (!text->context) - return FALSE; + return false; int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); UBool isAccessible; if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) @@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text ASSERT(newContext == UTextProviderContext::PriorContext); textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); } - return TRUE; + return true; } static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) --- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-07-17 10:21:33 UTC +++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp @@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) { if (!text->context) - return FALSE; + return false; int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); UBool isAccessible; if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) @@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, ASSERT(newContext == UTextProviderContext::PriorContext); textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); } - return TRUE; + return true; } static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) --- modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-07-17 10:21:33 UTC +++ modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp @@ -239,7 +239,7 @@ void TextCodecICU::createICUConverter() const UErrorCode error = U_ZERO_ERROR; m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close }; if (m_converter) - ucnv_setFallback(m_converter.get(), TRUE); + ucnv_setFallback(m_converter.get(), true); } int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)