Fix the Apple Internal Mac build with a newer SDK
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Dec 2018 18:56:24 +0000 (18:56 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Dec 2018 18:56:24 +0000 (18:56 +0000)
* wtf/URLHelpers.cpp:
(WTF::URLHelpers::userVisibleURL):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239274 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog
Source/WTF/wtf/URLHelpers.cpp

index 4f3ff81..9c480a5 100644 (file)
@@ -1,3 +1,10 @@
+2018-12-17  Daniel Bates  <dabates@apple.com>
+
+        Fix the Apple Internal Mac build with a newer SDK
+
+        * wtf/URLHelpers.cpp:
+        (WTF::URLHelpers::userVisibleURL):
+
 2018-12-17  Matt Lewis  <jlewis3@apple.com>
 
         Unreviewed, rolling out r239254.
index 3684232..fd08405 100644 (file)
@@ -850,11 +850,15 @@ String userVisibleURL(const CString& url)
 
     Vector<UChar, urlBytesBufferLength> normalizedCharacters(sourceBuffer.size());
     UErrorCode uerror = U_ZERO_ERROR;
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     int32_t normalizedLength = unorm_normalize(sourceBuffer.data(), sourceBuffer.size(), UNORM_NFC, 0, normalizedCharacters.data(), sourceBuffer.size(), &uerror);
+ALLOW_DEPRECATED_DECLARATIONS_END
     if (uerror == U_BUFFER_OVERFLOW_ERROR) {
         uerror = U_ZERO_ERROR;
         normalizedCharacters.resize(normalizedLength);
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
         normalizedLength = unorm_normalize(sourceBuffer.data(), sourceBuffer.size(), UNORM_NFC, 0, normalizedCharacters.data(), normalizedLength, &uerror);
+ALLOW_DEPRECATED_DECLARATIONS_END
     }
     if (U_FAILURE(uerror))
         return { };