Temporarily revert icu changes

youtube · May 28, 2024 · a6b7b6b · a6b7b6b
1 parent 769e4a7
commit a6b7b6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/third_party/icu/source/common/unicode/umachine.h b/third_party/icu/source/common/unicode/umachine.h
@@ -414,14 +414,14 @@ typedef int8_t UBool;
         defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION)
     // Inside the ICU library code, never configurable.
     typedef char16_t UChar;
-#elif defined(STARBOARD) && U_SIZEOF_WCHAR_T==2
-    typedef wchar_t UChar;
-#elif defined(STARBOARD) && U_SIZEOF_WCHAR_T==4
-    typedef uint16_t UChar;
 #elif defined(UCHAR_TYPE)
     typedef UCHAR_TYPE UChar;
 #elif (U_CPLUSPLUS_VERSION >= 11)
     typedef char16_t UChar;
+#elif defined(STARBOARD) && U_SIZEOF_WCHAR_T==2
+    typedef wchar_t UChar;
+#elif defined(STARBOARD) && U_SIZEOF_WCHAR_T==4
+    typedef uint16_t UChar;
 #else
     typedef uint16_t UChar;
 #endif

diff --git a/third_party/icu/source/common/unicode/unistr.h b/third_party/icu/source/common/unicode/unistr.h
@@ -3153,7 +3153,7 @@ class U_COMMON_API UnicodeString : public Replaceable
    */
   inline UnicodeString(std::nullptr_t buffer, int32_t buffLength, int32_t buffCapacity);
 
-#if U_CHARSET_IS_UTF8 || !UCONFIG_NO_CONVERSION
+#if U_CHARSET_IS_UTF8 || !UCONFIG_NO_CONVERSION || 1
 
   /**
    * char* constructor.