Attachment 218663 Details for Bug 250270 – Fix java/openjdk15 build with clang 11

[patch] Fix java/openjdk15 build with clang 11

java__openjdk15-fix-clang11-build-1.diff (text/plain), 2.82 KB, created by Dimitry Andric on 2020-10-11 10:59:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2020-10-11 10:59:18 UTC

Size: 2.82 KB

patch

obsolete

>Index: java/openjdk15/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java
>===================================================================
>--- java/openjdk15/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java	(nonexistent)
>+++ java/openjdk15/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java.orig	2020-04-17 22:35:42 UTC
>++++ src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
>+@@ -529,7 +529,7 @@ static native String XSetLocaleModifiers(String modifi
>+           display   Specifies the connection to the X server.
>+           onoff     Specifies a Boolean value that indicates whether to enable or disable synchronization.
>+      */
>+-    static native int XSynchronize(long display, boolean onoff);
>++    static native long XSynchronize(long display, boolean onoff);
>+ 
>+     /**
>+      * Extracts an X event that can be processed in a secondary loop.
>
>Property changes on: java/openjdk15/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/openjdk15/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
>===================================================================
>--- java/openjdk15/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c	(nonexistent)
>+++ java/openjdk15/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c	(working copy)
>@@ -0,0 +1,15 @@
>+--- src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c.orig	2020-04-17 22:35:42 UTC
>++++ src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
>+@@ -2180,10 +2180,10 @@ Java_sun_awt_X11_XlibWrapper_copyLongArray(JNIEnv *env
>+     }
>+ }
>+ 
>+-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
>
>Property changes on: java/openjdk15/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 250270: 218660 | 218661 | 218662 | 218663