infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-03 12:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8074921: OS X build broken by reference to XToolkit

Browse Source 
Reviewed-by: alexsch, serb
This commit is contained in:
Alexander Zvegintsev 2015-03-11 16:48:43 +03:00
parent 741e72173c
commit 465abe9cfd
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
View File

@ -31,7 +31,6 @@ import java.awt.image.*;
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 abstract class UNIXToolkit extends SunToolkit
public boolean loadGTK() {
synchronized (GTK_LOCK) {
if (nativeGTKLoaded == null) {
XToolkit.awtLock();
try {
nativeGTKLoaded = load_gtk();
} finally {
XToolkit.awtUnlock();
}
nativeGTKLoaded = load_gtk();
}
}
return nativeGTKLoaded;

5
jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -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 @@ gboolean gtk2_load(JNIEnv *env)
* 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 @@ gboolean gtk2_load(JNIEnv *env)
XSetErrorHandler(handler);
XSetIOErrorHandler(io_handler);
AWT_UNLOCK();
/* Initialize widget array. */
for (i = 0; i < _GTK_WIDGET_TYPE_SIZE; i++)