[patch] qtwebkit-5.7.1-icu-59.patch

qtwebkit-5.7.1-icu-59.patch (text/plain), 1.80 KB, created by Arfrever Frehtes Taifersar Arahesis on 2017-05-16 11:33:41 UTC

--- /Source/JavaScriptCore/API/JSStringRef.h
+++ /Source/JavaScriptCore/API/JSStringRef.h
@@ -26,6 +26,7 @@
 #ifndef JSStringRef_h
 #define JSStringRef_h
 
+#include <unicode/umachine.h>
 #include <JavaScriptCore/JSValueRef.h>
 
 #ifndef __cplusplus
@@ -37,16 +38,11 @@
 extern "C" {
 #endif
 
-#if !defined(WIN32) && !defined(_WIN32) \
-    && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
 /*!
 @typedef JSChar
 @abstract A Unicode character.
 */
-    typedef unsigned short JSChar;
-#else
-    typedef wchar_t JSChar;
-#endif
+typedef UChar JSChar;
 
 /*!
 @function
--- /Source/WTF/wtf/TypeTraits.h
+++ /Source/WTF/wtf/TypeTraits.h
@@ -72,6 +72,8 @@
     template<> struct IsInteger<unsigned long>      { static const bool value = true; };
     template<> struct IsInteger<long long>          { static const bool value = true; };
     template<> struct IsInteger<unsigned long long> { static const bool value = true; };
+    template<> struct IsInteger<char16_t>           { static const bool value = true; };
+    template<> struct IsInteger<char32_t>           { static const bool value = true; };
 #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
     template<> struct IsInteger<wchar_t>            { static const bool value = true; };
 #endif
--- /Source/WebKit2/Shared/API/c/WKString.h
+++ /Source/WebKit2/Shared/API/c/WKString.h
@@ -26,6 +26,7 @@
 #ifndef WKString_h
 #define WKString_h
 
+#include <unicode/umachine.h>
 #include <WebKit2/WKBase.h>
 
 #ifndef __cplusplus
@@ -36,12 +37,7 @@
 extern "C" {
 #endif
 
-#if !defined(WIN32) && !defined(_WIN32) \
-    && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
-    typedef unsigned short WKChar;
-#else
-    typedef wchar_t WKChar;
-#endif
+typedef UChar WKChar;
 
 WK_EXPORT WKTypeID WKStringGetTypeID();