68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
|
From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
|||
|
|
Date: Sun, 2 Feb 2020 10:51:00 +0100
|
|||
|
|
Subject: [PATCH] Fix ICU related compile failures.
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
The ICU macro U16_NEXT() needs a trailing semicolon.
|
|||
|
|
|
|||
|
|
Fixes:
|
|||
|
|
|
|||
|
|
platform/graphics/SegmentedFontData.cpp:65:9: error: expected ‘;’ before ‘if’
|
|||
|
|
dom/Document.cpp:3850:5: error: expected ‘;’ before ‘if’
|
|||
|
|
dom/Document.cpp:3855:9: error: expected ‘;’ before ‘if’
|
|||
|
|
dom/Document.cpp:3918:9: error: expected ‘;’ before ‘if’
|
|||
|
|
|
|||
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|||
|
|
---
|
|||
|
|
Source/WebCore/dom/Document.cpp | 6 +++---
|
|||
|
|
Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +-
|
|||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|||
|
|
|
|||
|
|
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
|
|||
|
|
index af63b141..26f7312b 100644
|
|||
|
|
--- a/Source/WebCore/dom/Document.cpp
|
|||
|
|
+++ b/Source/WebCore/dom/Document.cpp
|
|||
|
|
@@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
|
|||
|
|
unsigned i = 0;
|
|||
|
|
|
|||
|
|
UChar32 c;
|
|||
|
|
- U16_NEXT(characters, i, length, c)
|
|||
|
|
+ U16_NEXT(characters, i, length, c);
|
|||
|
|
if (!isValidNameStart(c))
|
|||
|
|
return false;
|
|||
|
|
|
|||
|
|
while (i < length) {
|
|||
|
|
- U16_NEXT(characters, i, length, c)
|
|||
|
|
+ U16_NEXT(characters, i, length, c);
|
|||
|
|
if (!isValidNamePart(c))
|
|||
|
|
return false;
|
|||
|
|
}
|
|||
|
|
@@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
|
|||
|
|
const UChar* s = qualifiedName.characters();
|
|||
|
|
for (unsigned i = 0; i < length;) {
|
|||
|
|
UChar32 c;
|
|||
|
|
- U16_NEXT(s, i, length, c)
|
|||
|
|
+ U16_NEXT(s, i, length, c);
|
|||
|
|
if (c == ':') {
|
|||
|
|
if (sawColon) {
|
|||
|
|
ec = NAMESPACE_ERR;
|
|||
|
|
diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
|
|||
|
|
index efb20a8c..99b3e86c 100644
|
|||
|
|
--- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp
|
|||
|
|
+++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
|
|||
|
|
@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length)
|
|||
|
|
{
|
|||
|
|
UChar32 c;
|
|||
|
|
for (int i = 0; i < length; ) {
|
|||
|
|
- U16_NEXT(characters, i, length, c)
|
|||
|
|
+ U16_NEXT(characters, i, length, c);
|
|||
|
|
if (!containsCharacter(c))
|
|||
|
|
return false;
|
|||
|
|
}
|
|||
|
|
--
|
|||
|
|
2.25.0
|
|||
|
|
|