d3bafec202
Fixes: 0f6c209a1d ("package/qt5webkit: fix ICU related compile failures from capital bool defines")
Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
100 lines
4.3 KiB
Diff
100 lines
4.3 KiB
Diff
From 37ee268d9d07a8dad02c1d8db3bf96e0b30df10b Mon Sep 17 00:00:00 2001
|
|
From: Henri Roosen <henri.roosen@ginzinger.com>
|
|
Date: Thu, 18 Mar 2021 11:53:57 +0100
|
|
Subject: [PATCH] Fix ICU related compile failures from capital bool defines
|
|
|
|
See ICU-21267
|
|
|
|
Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
|
|
---
|
|
.../platform/text/TextBreakIteratorICU.cpp | 16 ++++++++--------
|
|
Source/WebCore/platform/text/TextCodecICU.cpp | 2 +-
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp
|
|
index b4046ac9..832890a2 100644
|
|
--- a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp
|
|
+++ b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp
|
|
@@ -214,12 +214,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
|
|
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
|
|
ASSERT(offset < numeric_limits<int32_t>::max());
|
|
text->chunkOffset = offset < numeric_limits<int32_t>::max() ? static_cast<int32_t>(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 {
|
|
@@ -228,12 +228,12 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
|
|
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
|
|
ASSERT(offset < numeric_limits<int32_t>::max());
|
|
text->chunkOffset = offset < numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
|
|
- isAccessible = TRUE;
|
|
+ isAccessible = true;
|
|
return true;
|
|
}
|
|
if (nativeIndex <= 0 && !text->chunkNativeStart) {
|
|
text->chunkOffset = 0;
|
|
- isAccessible = FALSE;
|
|
+ isAccessible = false;
|
|
return true;
|
|
}
|
|
}
|
|
@@ -243,7 +243,7 @@ static inline bool textInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
|
|
static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward)
|
|
{
|
|
if (!text->context)
|
|
- return FALSE;
|
|
+ return false;
|
|
int64_t nativeLength = textNativeLength(text);
|
|
UBool isAccessible;
|
|
if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
|
|
@@ -263,7 +263,7 @@ static UBool textLatin1Access(UText* text, int64_t nativeIndex, UBool forward)
|
|
ASSERT(newContext == PriorContext);
|
|
textLatin1SwitchToPriorContext(text, nativeIndex, nativeLength, forward);
|
|
}
|
|
- return TRUE;
|
|
+ return true;
|
|
}
|
|
|
|
static const struct UTextFuncs textLatin1Funcs = {
|
|
@@ -364,7 +364,7 @@ static void textUTF16SwitchToPriorContext(UText* text, int64_t nativeIndex, int6
|
|
static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward)
|
|
{
|
|
if (!text->context)
|
|
- return FALSE;
|
|
+ return false;
|
|
int64_t nativeLength = textNativeLength(text);
|
|
UBool isAccessible;
|
|
if (textInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
|
|
@@ -384,7 +384,7 @@ static UBool textUTF16Access(UText* text, int64_t nativeIndex, UBool forward)
|
|
ASSERT(newContext == PriorContext);
|
|
textUTF16SwitchToPriorContext(text, nativeIndex, nativeLength, forward);
|
|
}
|
|
- return TRUE;
|
|
+ return true;
|
|
}
|
|
|
|
static const struct UTextFuncs textUTF16Funcs = {
|
|
diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
|
|
index 86d4ea17..da152edd 100644
|
|
--- a/Source/WebCore/platform/text/TextCodecICU.cpp
|
|
+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
|
|
@@ -269,7 +269,7 @@ void TextCodecICU::createICUConverter() const
|
|
m_converterICU = ucnv_open(m_canonicalConverterName, &err);
|
|
ASSERT(U_SUCCESS(err));
|
|
if (m_converterICU)
|
|
- ucnv_setFallback(m_converterICU, TRUE);
|
|
+ ucnv_setFallback(m_converterICU, true);
|
|
}
|
|
|
|
int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
|
|
--
|
|
2.20.1
|
|
|