Subject: [PATCH] Fix compilation against ICU 59+. ICU4C has moved to char16_t as the type for UTF-16 http://site.icu-project.org/download/59 diff --git a/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h b/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h index 0993aa6..e6ea131 100644 --- a/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h +++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h @@ -15,21 +15,6 @@ #define CharProp(p) com_sun_webkit_dom_CharacterDataImpl_##p -#if PLATFORM(JAVA) && OS(WINDOWS) -typedef wchar_t UChar; -#else -typedef uint16_t UChar; -#endif - -// #ifdef UChar32 -// #undef UChar32 -// #endif - -#ifndef __UMACHINE_H__ //XXX: recheck -typedef uint32_t UChar32; -#endif - -#define U_MASK(x) ((uint32_t)1<<(x)) #define USE_FAST_PATH(c, fast, slow) ((c) <= 0x7F ? fast((char)c) : slow(c)) #define CHECK_PROPERTY(c, mask, isSet) \ -- 2.26.2