Merge pull request #14674 from compnerd/icu-shims

Shims: adjust the ICU interface

Author: compnerd

stdlib/public/SwiftShims/UnicodeShims.h

@@ -294,7 +294,15 @@ typedef enum __swift_stdlib_UBreakIteratorType {
 } __swift_stdlib_UBreakIteratorType;
 
 typedef struct __swift_stdlib_UBreakIterator __swift_stdlib_UBreakIterator;
+#if defined(__APPLE__)
 typedef __swift_uint16_t __swift_stdlib_UChar;
+#else
+#if defined(__cplusplus)
+typedef char16_t __swift_stdlib_UChar;
+#else
+typedef __swift_uint16_t __swift_stdlib_UChar;
+#endif
+#endif
 
 SWIFT_RUNTIME_STDLIB_INTERFACE
 void __swift_stdlib_ubrk_close(__swift_stdlib_UBreakIterator *bi);

stdlib/public/stubs/UnicodeNormalization.cpp

@@ -301,7 +301,8 @@ void swift::__swift_stdlib_ubrk_close(
 
 swift::__swift_stdlib_UBreakIterator *swift::__swift_stdlib_ubrk_open(
     swift::__swift_stdlib_UBreakIteratorType type, const char *locale,
-    const uint16_t *text, int32_t textLength, __swift_stdlib_UErrorCode *status) {
+    const __swift_stdlib_UChar *text, int32_t textLength,
+    __swift_stdlib_UErrorCode *status) {
   return ptr_cast<swift::__swift_stdlib_UBreakIterator>(
       ubrk_open(static_cast<UBreakIteratorType>(type), locale,
                 reinterpret_cast<const UChar *>(text), textLength,