171 lines
8.0 KiB
Diff
171 lines
8.0 KiB
Diff
Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
|
|
|
|
In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
|
|
Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
|
|
ucnv_setFallback(m_converterICU, TRUE);
|
|
^
|
|
In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
|
|
In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
|
|
Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
|
|
isAccessible = TRUE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
|
|
isAccessible = FALSE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
|
|
isAccessible = TRUE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
|
|
isAccessible = FALSE;
|
|
^
|
|
In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
|
|
Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
|
|
return TRUE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
|
|
return FALSE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
|
|
return TRUE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
|
|
return FALSE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
|
|
return TRUE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
|
|
return FALSE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
|
|
return TRUE;
|
|
^
|
|
In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
|
|
Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
|
|
return FALSE;
|
|
^
|
|
Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
|
|
return TRUE;
|
|
^
|
|
|
|
--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC
|
|
+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
|
|
@@ -308,7 +308,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)
|
|
--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC
|
|
+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
|
|
@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
|
|
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
|
|
ASSERT(offset < std::numeric_limits<int32_t>::max());
|
|
text->chunkOffset = offset < std::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 {
|
|
@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
|
|
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
|
|
ASSERT(offset < std::numeric_limits<int32_t>::max());
|
|
text->chunkOffset = offset < std::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;
|
|
}
|
|
}
|
|
--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC
|
|
+++ b/Source/WebCore/platform/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<int32_t>(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<int32_t>(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<int32_t>(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)
|
|
--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC
|
|
+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
|
|
@@ -125,7 +125,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))
|
|
@@ -145,7 +145,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)
|