summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-01-18 11:38:27 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-01-18 11:38:27 +0000
commitf3b95f098b7b7568ffc7f30dbed89fb1f1f149d4 (patch)
tree718da4999907f46bbabfba7bc37de11798a0cb54 /include
parent2800ca913031a6702b4c493b0fb4794d7af80d6a (diff)
downloadclasspath-f3b95f098b7b7568ffc7f30dbed89fb1f1f149d4.tar.gz
2005-01-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge of the following changes from HEAD 2005-01-18 Jeroen Frijters <jeroen@frijters.net> * java/io/Externalizable.java, java/io/Serializable.java (serialVersionUID): Removed. * java/rmi/server/RemoteObject.java, java/rmi/server/UID.java (serialVersionUID): Made private. * java/rmi/server/RemoteRef.java, java/rmi/server/ServerRef.java (serialVersionUID): Set proper value. * java/security/interfaces/DSAPrivateKey.java, java/security/interfaces/DSAPublicKey.java, java/security/interfaces/RSAMultiPrimePrivateCrtKey.java, java/security/interfaces/RSAPrivateCrtKey.java, java/security/interfaces/RSAPrivateKey.java, java/security/interfaces/RSAPublicKey.java, javax/crypto/SecretKey.java (serialVersionUID): Added. 2005-01-18 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise. * java/awt/EventQueue.java (getNextEvent): Adjust event loop to switch to native mode after 100ms. * javax/swing/Timer.java (drainEvents): Reuse Runnable. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c (Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose): Wake up event thread. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (Java_gnu_java_awt_peer_gtk_GtkToolkit_iterateNativeQueue): Adjust event loop to switch to java mode after 100ms. 2005-01-18 Michael Koch <konqueror@gmx.de> * include/gnu_java_awt_peer_gtk_GtkToolkit.h: Regenerated. 2005-01-17 Tom Tromey <tromey@redhat.com> * java/text/MessageFormat.java (scanString): Changed how quoting is handled. (scanFormatElement): Likewise. 2005-01-17 Mark Wielaard <mark@klomp.org> * scripts/check_jni_methods.sh: Don't use mktemp for TMPFILEs. 2005-01-17 Michael Koch <konqueror@gmx.de> PR libgcj/19444 * java/net/URI.java (AUTHORITY_REGEXP): New regexp constant. (AUTHORITY_USERINFO_GROUP): New constant. (AUTHORITY_HOST_GROUP): Likewise. (AUTHORITY_PORT_GROUP): Likewise. (port): Changed default value to -1. (parseURI): Parse authority part and initialize host, port and userInfo. 2005-01-17 Michael Koch <konqueror@gmx.de> * javax/print/attribute/standard/Chromaticity.java, javax/print/attribute/standard/Destination.java: New files. 2005-01-17 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implemented. * javax/imageio/metadata/IIOAttr.java, javax/imageio/metadata/IIONamedNodeMap.java, javax/imageio/metadata/IIONodeList.java: New files
Diffstat (limited to 'include')
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkToolkit.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gnu_java_awt_peer_gtk_GtkToolkit.h b/include/gnu_java_awt_peer_gtk_GtkToolkit.h
index c3c078772..55febed56 100644
--- a/include/gnu_java_awt_peer_gtk_GtkToolkit.h
+++ b/include/gnu_java_awt_peer_gtk_GtkToolkit.h
@@ -18,7 +18,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_sync (JNIEnv *env,
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_loadSystemColors (JNIEnv *env, jobject, jintArray);
JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_nativeQueueEmpty (JNIEnv *env, jobject);
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_wakeNativeQueue (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_iterateNativeQueue (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_iterateNativeQueue (JNIEnv *env, jobject, jobject, jboolean);
#ifdef __cplusplus
}