Description:  Fix some uint16/char16 issues in javascriptcore.
Author: Peter Michael Green <plugwash@raspbian.org>

Last-Update: 2018-05-29

--- openjfx-8u141-b14.orig/modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp
+++ openjfx-8u141-b14/modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp
@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
 JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
 {
     initializeThreading();
-    return &OpaqueJSString::create(chars, numChars).leakRef();
+    return &OpaqueJSString::create((const UChar*)chars, numChars).leakRef();
 }
 
 JSStringRef JSStringCreateWithUTF8CString(const char* string)
@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CStrin
 JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
 {
     initializeThreading();
-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
+    return OpaqueJSString::create(StringImpl::createWithoutCopying((const UChar*)chars, numChars)).leakRef();
 }
 
 JSStringRef JSStringRetain(JSStringRef string)
@@ -87,7 +87,7 @@ const JSChar* JSStringGetCharactersPtr(J
 {
     if (!string)
         return nullptr;
-    return string->characters();
+    return (const JSChar*)(string->characters());
 }
 
 size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
--- openjfx-8u141-b14.orig/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
+++ openjfx-8u141-b14/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
@@ -18,7 +18,7 @@
 #if PLATFORM(JAVA) && OS(WINDOWS)
 typedef wchar_t UChar;
 #else
-typedef uint16_t UChar;
+typedef char16_t UChar;
 #endif
 
 // #ifdef UChar32
