* include/Makefile.am: Add java_lang_VMDouble.h. Remove

	java.lang.VMRuntime.

	* include/gnu_java_awt_EmbeddedWindow.h: Regenerated.
	* include/gnu_java_awt_peer_gtk_GdkFontMetrics.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GdkGraphics.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkChoicePeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkClipboard.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkFramePeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkGenericPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkImagePainter.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkLabelPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkListPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkMainThread.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkMenuPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkPanelPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkToolkit.h: Likewise.
	* include/gnu_java_awt_peer_gtk_GtkWindowPeer.h: Likewise.
	* include/gnu_java_net_PlainDatagramSocketImpl.h: Likewise.
	* include/gnu_java_net_PlainSocketImpl.h: Likewise.
	* include/gnu_java_nio_NIOServerSocket.h: Likewise.
	* include/gnu_java_nio_PipeImpl.h: Likewise.
	* include/gnu_java_nio_SelectorImpl.h: Likewise.
	* include/gnu_java_nio_channels_FileChannelImpl.h: Likewise.
	* include/java_io_ObjectInputStream.h: Likewise.
	* include/java_io_VMFile.h: Likewise.
	* include/java_io_VMObjectStreamClass.h: Likewise.
	* include/java_lang_Double.h: Likewise.
	* include/java_lang_Math.h: Likewise.
	* include/java_lang_Object.h: Likewise.
	* include/java_lang_VMDouble.h: Likewise.
	* include/java_lang_VMFloat.h: Likewise.
	* include/java_lang_VMProcess.h: Likewise.
	* include/java_lang_VMSystem.h: Likewise.
	* include/java_lang_reflect_Array.h: Likewise.
	* include/java_net_InetAddress.h: Likewise.
	* include/java_net_NetworkInterface.h: Likewise.
	* include/java_nio_DirectByteBufferImpl.h: Likewise.
	* include/java_nio_MappedByteBufferImpl.h: Likewise.
	* include/java_nio_channels_Channels.h: Likewise.
	* include/java_util_TimeZone.h: Likewise.

	* include/gnu_java_nio_MappedByteFileBuffer.h: Removed.
	* include/java_lang_Thread.h: Removed.
	* include/java_lang_VMClass.h: Removed.
	* include/java_lang_VMRuntime.h: Removed.
	* include/java_lang_reflect_Constructor.h: Removed.
	* include/java_lang_reflect_Field.h: Removed.
	* include/java_lang_reflect_Method.h: Removed.
	* include/java_lang_reflect_Proxy.h: Removed.

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java (requestFocus):
	Implement by calling gtkRequestFocus.
	(gtkRequestFocus): New native method.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__):
	Renamed to ...
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus):
	New function name.
	(filter_expose_event_handler): Mark static.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
	(menu_pos): Mark static.

1 files changed, 6 insertions, 6 deletions

diff --git a/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h b/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
index db3b79563..81a0a475b 100644
--- a/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
@@ -10,12 +10,12 @@ extern "C"
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues (JNIEnv *env, jobject, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }