--- old/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c	2017-10-16 13:03:49.181447616 -0700
+++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c	2017-10-16 13:03:49.029448066 -0700
@@ -583,9 +583,9 @@
 (JNIEnv *env, jclass clazz, jlong display, jlong which, jlong device_spec)
 {
     AWT_CHECK_HAVE_LOCK_RETURN(0);
-    return (jlong) XkbGetMap( (Display *) jlong_to_ptr(display),
+    return ptr_to_jlong(XkbGetMap( (Display *) jlong_to_ptr(display),
                               (unsigned int) which,
-                              (unsigned int) device_spec);
+                              (unsigned int) device_spec));
 }
 JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XkbGetUpdatedMap
 (JNIEnv *env, jclass clazz, jlong display, jlong which, jlong xkb)
@@ -606,7 +606,7 @@
 {
     AWT_CHECK_HAVE_LOCK_RETURN(JNI_FALSE);
     Bool b;
-    b = XkbTranslateKeyCode((XkbDescPtr)xkb, (unsigned int)keycode, (unsigned int)mods,
+    b = XkbTranslateKeyCode((XkbDescPtr)jlong_to_ptr(xkb), (unsigned int)keycode, (unsigned int)mods,
                               (unsigned int *)jlong_to_ptr(mods_rtrn),
                                (KeySym *)jlong_to_ptr(keysym_rtrn));
     //printf("native,  input: keycode:0x%0X; mods:0x%0X\n", keycode, mods);
@@ -2221,10 +2221,10 @@
     }
 }
 
-JNIEXPORT jint JNICALL
+JNIEXPORT jlong JNICALL
 Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff)
 {
-    return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
+    return ptr_to_jlong(XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False)));
 }
 
 JNIEXPORT jboolean JNICALL