Mercurial > hg > openjdk > aarch64-port > jdk
changeset 10708:47f9b525a135
8074921: OS X build broken by reference to XToolkit
Reviewed-by: alexsch, serb
author | azvegint |
---|---|
date | Wed, 11 Mar 2015 16:48:43 +0300 |
parents | 15df96dd089e |
children | afb4e235793b |
files | src/solaris/classes/sun/awt/UNIXToolkit.java src/solaris/native/sun/awt/gtk2_interface.c |
diffstat | 2 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/classes/sun/awt/UNIXToolkit.java Tue Mar 10 15:39:26 2015 +0300 +++ b/src/solaris/classes/sun/awt/UNIXToolkit.java Wed Mar 11 16:48:43 2015 +0300 @@ -31,7 +31,6 @@ import java.security.AccessController; import sun.security.action.GetIntegerAction; import com.sun.java.swing.plaf.gtk.GTKConstants.TextDirection; -import sun.awt.X11.XToolkit; import sun.java2d.opengl.OGLRenderQueue; public abstract class UNIXToolkit extends SunToolkit @@ -98,12 +97,7 @@ public boolean loadGTK() { synchronized (GTK_LOCK) { if (nativeGTKLoaded == null) { - XToolkit.awtLock(); - try { - nativeGTKLoaded = load_gtk(); - } finally { - XToolkit.awtUnlock(); - } + nativeGTKLoaded = load_gtk(); } } return nativeGTKLoaded;
--- a/src/solaris/native/sun/awt/gtk2_interface.c Tue Mar 10 15:39:26 2015 +0300 +++ b/src/solaris/native/sun/awt/gtk2_interface.c Wed Mar 11 16:48:43 2015 +0300 @@ -33,6 +33,7 @@ #include "jvm_md.h" #include "sizecalc.h" #include <jni_util.h> +#include "awt.h" #define GTK2_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gtk-x11-2.0", "0") #define GTK2_LIB JNI_LIB_NAME("gtk-x11-2.0") @@ -890,6 +891,7 @@ * BadMatch errors which we would normally ignore. The IO error handler * is preserved here, too, just for consistency. */ + AWT_LOCK(); handler = XSetErrorHandler(NULL); io_handler = XSetIOErrorHandler(NULL); @@ -926,6 +928,7 @@ XSetErrorHandler(handler); XSetIOErrorHandler(io_handler); + AWT_UNLOCK(); /* Initialize widget array. */ for (i = 0; i < _GTK_WIDGET_TYPE_SIZE; i++)