0005-Fix-ICU-related-compile-failures.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. From 38e3436db7222ac403a405db7e0fd1d472f1704a Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Sun, 2 Feb 2020 10:51:00 +0100
  4. Subject: [PATCH] Fix ICU related compile failures.
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. The ICU macro U16_NEXT() needs a trailing semicolon.
  9. Fixes:
  10. platform/graphics/SegmentedFontData.cpp:65:9: error: expected ‘;’ before ‘if’
  11. dom/Document.cpp:3850:5: error: expected ‘;’ before ‘if’
  12. dom/Document.cpp:3855:9: error: expected ‘;’ before ‘if’
  13. dom/Document.cpp:3918:9: error: expected ‘;’ before ‘if’
  14. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  15. ---
  16. Source/WebCore/dom/Document.cpp | 6 +++---
  17. Source/WebCore/platform/graphics/SegmentedFontData.cpp | 2 +-
  18. 2 files changed, 4 insertions(+), 4 deletions(-)
  19. diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
  20. index af63b141..26f7312b 100644
  21. --- a/Source/WebCore/dom/Document.cpp
  22. +++ b/Source/WebCore/dom/Document.cpp
  23. @@ -3846,12 +3846,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
  24. unsigned i = 0;
  25. UChar32 c;
  26. - U16_NEXT(characters, i, length, c)
  27. + U16_NEXT(characters, i, length, c);
  28. if (!isValidNameStart(c))
  29. return false;
  30. while (i < length) {
  31. - U16_NEXT(characters, i, length, c)
  32. + U16_NEXT(characters, i, length, c);
  33. if (!isValidNamePart(c))
  34. return false;
  35. }
  36. @@ -3914,7 +3914,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
  37. const UChar* s = qualifiedName.characters();
  38. for (unsigned i = 0; i < length;) {
  39. UChar32 c;
  40. - U16_NEXT(s, i, length, c)
  41. + U16_NEXT(s, i, length, c);
  42. if (c == ':') {
  43. if (sawColon) {
  44. ec = NAMESPACE_ERR;
  45. diff --git a/Source/WebCore/platform/graphics/SegmentedFontData.cpp b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
  46. index efb20a8c..99b3e86c 100644
  47. --- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp
  48. +++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
  49. @@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacters(const UChar* characters, int length)
  50. {
  51. UChar32 c;
  52. for (int i = 0; i < length; ) {
  53. - U16_NEXT(characters, i, length, c)
  54. + U16_NEXT(characters, i, length, c);
  55. if (!containsCharacter(c))
  56. return false;
  57. }
  58. --
  59. 2.25.0