OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2005-05-03 Thomas Fitzsimmons <fitzsim@redhat.com> 

* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
        (init_glib_threads): Check if threading system is already
        initialized.

From-SVN: r99196
This commit is contained in:
Thomas Fitzsimmons 2005-05-03 23:53:27 +00:00
parent f525d7a75f
commit 9247d229f6
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-03 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
(init_glib_threads): Check if threading system is already
initialized.
2005-05-03 Andrew Overholt <overholt@redhat.com>
PR libgcj/21372:
@ -136,6 +142,7 @@
* gnu/java/net/protocol/file/Connection.java
(lineSeparator): Initialize with SystemProperties.getProperty().
>>>>>>> 1.3571
2005-04-27 Chris Burdess <dog@gnu.org>
* gnu/java/net/protocol/file/Connection.java: Return correct content

18
libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
View File

@ -275,10 +275,22 @@ init_glib_threads(JNIEnv *env, jint portableNativeSync)
}
(*env)->GetJavaVM( env, &the_vm );
if (portableNativeSync)
g_thread_init ( &portable_native_sync_jni_functions );
if (!g_thread_supported ())
{
if (portableNativeSync)
g_thread_init ( &portable_native_sync_jni_functions );
else
g_thread_init ( NULL );
}
else
g_thread_init ( NULL );
{
/* Warn if portable native sync is desired but the threading
system is already initialized. In that case we can't
override the threading implementation with our portable
native sync functions. */
if (portableNativeSync)
g_printerr ("peer warning: portable native sync disabled.\n");
}
/* Debugging progress message; uncomment if needed: */
/* printf("called gthread init\n"); */