unorm2.h says UChar is unsigned short, but cd58f5c changed that to char16_t which is supposed to be the same thing on C++11

Author: Lance Parker

stdlib/public/SwiftShims/UnicodeShims.h

@@ -440,8 +440,8 @@ __swift_stdlib_unorm2_getNFCInstance(__swift_stdlib_UErrorCode *);
 SWIFT_RUNTIME_STDLIB_INTERFACE
 __swift_int32_t
 __swift_stdlib_unorm2_normalize(const __swift_stdlib_UNormalizer2 *,
-                                const __swift_stdlib_UChar *, __swift_int32_t,
-                                __swift_stdlib_UChar *, __swift_int32_t,
+                                const __swift_uint16_t *, __swift_int32_t,
+                                __swift_uint16_t *, __swift_int32_t,
                                 __swift_stdlib_UErrorCode *);
 
 SWIFT_RUNTIME_STDLIB_INTERFACE

stdlib/public/stubs/UnicodeNormalization.cpp

@@ -288,8 +288,8 @@ swift::__swift_stdlib_unorm2_getNFCInstance(__swift_stdlib_UErrorCode *err) {
 }
 
 int32_t swift::__swift_stdlib_unorm2_normalize(
-    const __swift_stdlib_UNormalizer2 *norm, const __swift_stdlib_UChar *src,
-    __swift_int32_t len, __swift_stdlib_UChar *dst, __swift_int32_t capacity,
+    const __swift_stdlib_UNormalizer2 *norm, const __swift_uint16_t *src,
+    __swift_int32_t len, __swift_uint16_t *dst, __swift_int32_t capacity,
     __swift_stdlib_UErrorCode *err) {
   return unorm2_normalize(ptr_cast<UNormalizer2>(norm), src, len, dst, capacity,
                           ptr_cast<UErrorCode>(err));