summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2004-05-28 17:27:34 +0000
committerMark Wielaard <mark@klomp.org>2004-05-28 17:27:34 +0000
commit1cc841af1ea57bc3eccd5fb0b246c161666e7e2a (patch)
treeb04f90e488212cf0350b92e9b17d100b7ce1ee95
parent57d245ef4c2546ef1a9df131c3d30a66dd9dbbfd (diff)
downloadclasspath-1cc841af1ea57bc3eccd5fb0b246c161666e7e2a.tar.gz
* 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.
-rw-r--r--ChangeLog83
-rw-r--r--gnu/java/awt/peer/gtk/GtkComponentPeer.java10
-rw-r--r--include/Makefile.am6
-rw-r--r--include/gnu_java_awt_EmbeddedWindow.h2
-rw-r--r--include/gnu_java_awt_peer_gtk_GdkFontMetrics.h4
-rw-r--r--include/gnu_java_awt_peer_gtk_GdkGraphics.h44
-rw-r--r--include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h8
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkButtonPeer.h12
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h2
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h4
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h4
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h10
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkChoicePeer.h12
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkClipboard.h6
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkComponentPeer.h48
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h4
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h8
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkFramePeer.h10
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkGenericPeer.h2
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkImagePainter.h2
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkLabelPeer.h8
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkListPeer.h24
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkMainThread.h4
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h6
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h2
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h6
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkMenuPeer.h8
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkPanelPeer.h4
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h4
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h16
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h12
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h12
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h18
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h8
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkToolkit.h8
-rw-r--r--include/gnu_java_awt_peer_gtk_GtkWindowPeer.h18
-rw-r--r--include/gnu_java_net_PlainDatagramSocketImpl.h18
-rw-r--r--include/gnu_java_net_PlainSocketImpl.h22
-rw-r--r--include/gnu_java_nio_MappedByteFileBuffer.h32
-rw-r--r--include/gnu_java_nio_NIOServerSocket.h2
-rw-r--r--include/gnu_java_nio_PipeImpl.h2
-rw-r--r--include/gnu_java_nio_SelectorImpl.h2
-rw-r--r--include/gnu_java_nio_channels_FileChannelImpl.h30
-rw-r--r--include/java_io_ObjectInputStream.h6
-rw-r--r--include/java_io_VMFile.h28
-rw-r--r--include/java_io_VMObjectStreamClass.h20
-rw-r--r--include/java_lang_Double.h6
-rw-r--r--include/java_lang_Math.h30
-rw-r--r--include/java_lang_Object.h2
-rw-r--r--include/java_lang_Thread.h33
-rw-r--r--include/java_lang_VMClass.h42
-rw-r--r--include/java_lang_VMDouble.h6
-rw-r--r--include/java_lang_VMFloat.h6
-rw-r--r--include/java_lang_VMProcess.h6
-rw-r--r--include/java_lang_VMRuntime.h32
-rw-r--r--include/java_lang_VMSystem.h14
-rw-r--r--include/java_lang_reflect_Array.h2
-rw-r--r--include/java_lang_reflect_Constructor.h20
-rw-r--r--include/java_lang_reflect_Field.h38
-rw-r--r--include/java_lang_reflect_Method.h23
-rw-r--r--include/java_lang_reflect_Proxy.h21
-rw-r--r--include/java_net_InetAddress.h8
-rw-r--r--include/java_net_NetworkInterface.h2
-rw-r--r--include/java_nio_DirectByteBufferImpl.h14
-rw-r--r--include/java_nio_MappedByteBufferImpl.h8
-rw-r--r--include/java_nio_channels_Channels.h4
-rw-r--r--include/java_util_TimeZone.h2
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c5
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c2
69 files changed, 389 insertions, 538 deletions
diff --git a/ChangeLog b/ChangeLog
index 9df7de9b8..a0c402f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,86 @@
+2004-05-28 Mark Wielaard <mark@klomp.org>
+
+ * 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.
+
2004-05-28 Michael Koch <konqueror@gmx.de>
* configure.ac: Removed include/jni.h from output files.
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index 1a9d963b7..7e6d73a31 100644
--- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -335,7 +335,15 @@ public class GtkComponentPeer extends GtkGenericPeer
new Rectangle (x, y, width, height)));
}
- native public void requestFocus ();
+ public void requestFocus ()
+ {
+ gtkRequestFocus();
+ }
+
+ // Called from requestFocus, we don't want to make requestFocus itself
+ // native since several JNI header generators have difficulties with
+ // overridden and/or miranda methods. (Bug in gcjh < 3.5.)
+ native private void gtkRequestFocus ();
public void reshape (int x, int y, int width, int height)
{
diff --git a/include/Makefile.am b/include/Makefile.am
index 8a7ae6cf8..c09f19c3b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -48,9 +48,9 @@ $(top_srcdir)/include/java_io_VMObjectStreamClass.h \
$(top_srcdir)/include/java_lang_Double.h \
$(top_srcdir)/include/java_lang_Math.h \
$(top_srcdir)/include/java_lang_Object.h \
+$(top_srcdir)/include/java_lang_VMDouble.h \
$(top_srcdir)/include/java_lang_VMFloat.h \
$(top_srcdir)/include/java_lang_VMProcess.h \
-$(top_srcdir)/include/java_lang_VMRuntime.h \
$(top_srcdir)/include/java_lang_VMSystem.h \
$(top_srcdir)/include/java_lang_reflect_Array.h \
$(top_srcdir)/include/java_net_InetAddress.h \
@@ -152,12 +152,12 @@ $(top_srcdir)/include/java_lang_Math.h: $(top_srcdir)/java/lang/Math.java
$(JAVAH) -o $@ java.lang.Math
$(top_srcdir)/include/java_lang_Object.h: $(top_srcdir)/java/lang/Object.java
$(JAVAH) -o $@ java.lang.Object
+$(top_srcdir)/include/java_lang_VMDouble.h: $(top_srcdir)/vm/reference/java/lang/VMDouble.java
+ $(JAVAH) -o $@ java.lang.VMDouble
$(top_srcdir)/include/java_lang_VMFloat.h: $(top_srcdir)/vm/reference/java/lang/VMFloat.java
$(JAVAH) -o $@ java.lang.VMFloat
$(top_srcdir)/include/java_lang_VMProcess.h: $(top_srcdir)/vm/reference/java/lang/VMProcess.java
$(JAVAH) -o $@ java.lang.VMProcess
-$(top_srcdir)/include/java_lang_VMRuntime.h: $(top_srcdir)/vm/reference/java/lang/VMRuntime.java
- $(JAVAH) -o $@ java.lang.VMRuntime
$(top_srcdir)/include/java_lang_VMSystem.h: $(top_srcdir)/vm/reference/java/lang/VMSystem.java
$(JAVAH) -o $@ java.lang.VMSystem
$(top_srcdir)/include/java_lang_reflect_Array.h: $(top_srcdir)/java/lang/reflect/Array.java
diff --git a/include/gnu_java_awt_EmbeddedWindow.h b/include/gnu_java_awt_EmbeddedWindow.h
index 2118f3322..3e658d0b8 100644
--- a/include/gnu_java_awt_EmbeddedWindow.h
+++ b/include/gnu_java_awt_EmbeddedWindow.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_EmbeddedWindow_setWindowPeer (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_EmbeddedWindow_setWindowPeer (JNIEnv *env, jobject, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h b/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h
index 58c209fb2..00c8dda70 100644
--- a/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h
+++ b/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth (JNIEnv *env, jobject, jstring, jint, jstring);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState (JNIEnv *env, jobject, jstring, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth (JNIEnv *env, jobject, jstring, jint, jstring);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GdkGraphics.h b/include/gnu_java_awt_peer_gtk_GdkGraphics.h
index c1418d040..95b289a33 100644
--- a/include/gnu_java_awt_peer_gtk_GdkGraphics.h
+++ b/include/gnu_java_awt_peer_gtk_GdkGraphics.h
@@ -10,28 +10,28 @@ extern "C"
{
#endif
-extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II (JNIEnv *env, jobject, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyState (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_dispose (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyPixmap (JNIEnv *env, jobject, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawLine (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawArc (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillArc (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawOval (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillOval (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolygon (JNIEnv *env, jobject, jintArray, jintArray, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillPolygon (JNIEnv *env, jobject, jintArray, jintArray, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolyline (JNIEnv *env, jobject, jintArray, jintArray, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawRect (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillRect (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString (JNIEnv *env, jobject, jstring, jint, jint, jstring, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setClipRectangle (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFGColor (JNIEnv *env, jobject, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFunction (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_translateNative (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyState (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_dispose (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyPixmap (JNIEnv *env, jobject, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawLine (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawArc (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillArc (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawOval (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillOval (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolygon (JNIEnv *env, jobject, jintArray, jintArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillPolygon (JNIEnv *env, jobject, jintArray, jintArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolyline (JNIEnv *env, jobject, jintArray, jintArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawRect (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillRect (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString (JNIEnv *env, jobject, jstring, jint, jint, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setClipRectangle (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFGColor (JNIEnv *env, jobject, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFunction (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_translateNative (JNIEnv *env, jobject, jint, jint);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h b/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
index e9d42b258..0c9c0a288 100644
--- a/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
+++ b/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initState (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_pumpBytes (JNIEnv *env, jobject, jbyteArray, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_finish (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initState (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_pumpBytes (JNIEnv *env, jobject, jbyteArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_finish (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h b/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h
index 5873ec62b..a8531e6cc 100644
--- a/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h
@@ -10,12 +10,12 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h b/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h
index 7e198bd2a..e774713a7 100644
--- a/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCanvasPeer_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCanvasPeer_create (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h b/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h
index ad53a4747..2fa368688 100644
--- a/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_dispose (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_remove (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_dispose (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_remove (JNIEnv *env, jobject, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h b/include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h
index 44e54bd78..87a161b11 100644
--- a/include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_create (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_setState (JNIEnv *env, jobject, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_create (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_setState (JNIEnv *env, jobject, jboolean);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h b/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
index 09fcb3eb1..2a0fa8a62 100644
--- a/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
@@ -10,11 +10,11 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate (JNIEnv *env, jobject, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheckboxGroup (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate (JNIEnv *env, jobject, jobject, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheckboxGroup (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel (JNIEnv *env, jobject, jstring);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h b/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h
index f8791dab1..ad2b3de8a 100644
--- a/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h
@@ -10,12 +10,12 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_append (JNIEnv *env, jobject, jobjectArray);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_getHistory (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeAdd (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemove (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_select (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_append (JNIEnv *env, jobject, jobjectArray);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_getHistory (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeAdd (JNIEnv *env, jobject, jstring, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemove (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_select (JNIEnv *env, jobject, jint);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkClipboard.h b/include/gnu_java_awt_peer_gtk_GtkClipboard.h
index 5be5cef2b..b5ad9b9dc 100644
--- a/include/gnu_java_awt_peer_gtk_GtkClipboard.h
+++ b/include/gnu_java_awt_peer_gtk_GtkClipboard.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkClipboard_requestStringConversion (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkClipboard_selectionGet (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkClipboard_requestStringConversion (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkClipboard_selectionGet (JNIEnv *env, jclass);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h b/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
index ca3573df6..c8c08e8ce 100644
--- a/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
@@ -10,30 +10,30 @@ extern "C"
{
#endif
-extern JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab (JNIEnv *env, jclass);
-extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground (JNIEnv *env, jobject);
-extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetVisible (JNIEnv *env, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions (JNIEnv *env, jobject, jintArray);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions (JNIEnv *env, jobject, jintArray);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen (JNIEnv *env, jobject, jintArray);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground (JNIEnv *env, jobject, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__ (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z (JNIEnv *env, jobject, jstring, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F (JNIEnv *env, jobject, jstring, jfloat);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2 (JNIEnv *env, jobject, jstring, jobject);
+JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled (JNIEnv *env, jobject);
+JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab (JNIEnv *env, jclass);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground (JNIEnv *env, jobject);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetVisible (JNIEnv *env, jobject, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions (JNIEnv *env, jobject, jintArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions (JNIEnv *env, jobject, jintArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen (JNIEnv *env, jobject, jintArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground (JNIEnv *env, jobject, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject, jstring, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z (JNIEnv *env, jobject, jstring, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I (JNIEnv *env, jobject, jstring, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F (JNIEnv *env, jobject, jstring, jfloat);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2 (JNIEnv *env, jobject, jstring, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h b/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
index 351586d7b..6d6e4b350 100644
--- a/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create (JNIEnv *env, jobject, jlong);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject, jlong);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h b/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
index 08688c40f..f5d57af8a 100644
--- a/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFile (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFile (JNIEnv *env, jobject, jstring);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkFramePeer.h b/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
index c9b61a0b5..29a95d7f8 100644
--- a/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
@@ -10,11 +10,11 @@ extern "C"
{
#endif
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible (JNIEnv *env, jobject, jboolean);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible (JNIEnv *env, jobject, jboolean);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h b/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
index e95f1f6fb..78987399b 100644
--- a/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkImagePainter.h b/include/gnu_java_awt_peer_gtk_GtkImagePainter.h
index bc648bab8..18f430b1a 100644
--- a/include/gnu_java_awt_peer_gtk_GtkImagePainter.h
+++ b/include/gnu_java_awt_peer_gtk_GtkImagePainter.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint, jint, jintArray, jint, jint, jdoubleArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint, jint, jintArray, jint, jint, jdoubleArray);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h b/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h
index 9076ace27..b2da80a09 100644
--- a/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create (JNIEnv *env, jobject, jstring, jfloat);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env, jobject, jfloat);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create (JNIEnv *env, jobject, jstring, jfloat);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env, jobject, jfloat);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText (JNIEnv *env, jobject, jstring);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkListPeer.h b/include/gnu_java_awt_peer_gtk_GtkListPeer.h
index 2ede87946..7985fa485 100644
--- a/include/gnu_java_awt_peer_gtk_GtkListPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkListPeer.h
@@ -10,18 +10,18 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize (JNIEnv *env, jobject, jint, jintArray);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_append (JNIEnv *env, jobject, jobjectArray);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_add (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_delItems (JNIEnv *env, jobject, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_deselect (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSelectedIndexes (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_makeVisible (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_select (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_setMultipleMode (JNIEnv *env, jobject, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize (JNIEnv *env, jobject, jint, jintArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_append (JNIEnv *env, jobject, jobjectArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_add (JNIEnv *env, jobject, jstring, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_delItems (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_deselect (JNIEnv *env, jobject, jint);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSelectedIndexes (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_makeVisible (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_select (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_setMultipleMode (JNIEnv *env, jobject, jboolean);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkMainThread.h b/include/gnu_java_awt_peer_gtk_GtkMainThread.h
index 29ecc4ce2..799cb74c9 100644
--- a/include/gnu_java_awt_peer_gtk_GtkMainThread.h
+++ b/include/gnu_java_awt_peer_gtk_GtkMainThread.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h b/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
index 93ea5f3ad..61a4641e6 100644
--- a/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_delMenu (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_delMenu (JNIEnv *env, jobject, jint);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h b/include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h
index f3c721dbd..3b71dde38 100644
--- a/include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h b/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
index 724640eef..09940df85 100644
--- a/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel (JNIEnv *env, jobject, jstring);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h b/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h
index a48b05e91..1cd18c111 100644
--- a/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem (JNIEnv *env, jobject, jobject, jint, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem (JNIEnv *env, jobject, jobject, jint, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem (JNIEnv *env, jobject, jint);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h b/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h
index 8f43b3704..3cc1f3f5b 100644
--- a/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h b/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h
index 165bc4f86..aae817fe4 100644
--- a/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show (JNIEnv *env, jobject, jint, jint, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show (JNIEnv *env, jobject, jint, jint, jlong);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h b/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
index 927bfb255..ceaadad53 100644
--- a/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
@@ -10,14 +10,14 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create (JNIEnv *env, jobject, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetScrollPosition (JNIEnv *env, jobject, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncrement (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setPolicy (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setScrollPosition (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetScrollPosition (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncrement (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setPolicy (JNIEnv *env, jobject, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setScrollPosition (JNIEnv *env, jobject, jint, jint);
#ifdef __cplusplus
}
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
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h b/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
index d2d466fd7..7272262cd 100644
--- a/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
@@ -10,12 +10,12 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create (JNIEnv *env, jobject, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange (JNIEnv *env, jobject, jstring, jint, jint);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create (JNIEnv *env, jobject, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert (JNIEnv *env, jobject, jstring, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange (JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h b/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
index 5282c593c..0972bf118 100644
--- a/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
@@ -10,15 +10,15 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getCaretPosition (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setCaretPosition (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionStart (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionEnd (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getText (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_select (JNIEnv *env, jobject, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setEditable (JNIEnv *env, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setText (JNIEnv *env, jobject, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getCaretPosition (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setCaretPosition (JNIEnv *env, jobject, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionStart (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionEnd (JNIEnv *env, jobject);
+JNIEXPORT jstring JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getText (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_select (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setEditable (JNIEnv *env, jobject, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setText (JNIEnv *env, jobject, jstring);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h b/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
index 5eee9f320..aeab5a608 100644
--- a/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar (JNIEnv *env, jobject, jchar);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create (JNIEnv *env, jobject, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar (JNIEnv *env, jobject, jchar);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkToolkit.h b/include/gnu_java_awt_peer_gtk_GtkToolkit.h
index db9c5f399..5624f7e18 100644
--- a/include/gnu_java_awt_peer_gtk_GtkToolkit.h
+++ b/include/gnu_java_awt_peer_gtk_GtkToolkit.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_beep (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions (JNIEnv *env, jobject, jintArray);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_sync (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_beep (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions (JNIEnv *env, jobject, jintArray);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_sync (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h b/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h
index bd3c7f529..283c6ce2c 100644
--- a/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h
@@ -10,15 +10,15 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject, jintArray);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBounds (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setSize (JNIEnv *env, jobject, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setBoundsCallback (JNIEnv *env, jobject, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible (JNIEnv *env, jobject, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject, jintArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBounds (JNIEnv *env, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setSize (JNIEnv *env, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setBoundsCallback (JNIEnv *env, jobject, jobject, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible (JNIEnv *env, jobject, jboolean);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_net_PlainDatagramSocketImpl.h b/include/gnu_java_net_PlainDatagramSocketImpl.h
index 9d1aa8ba4..f180b228a 100644
--- a/include/gnu_java_net_PlainDatagramSocketImpl.h
+++ b/include/gnu_java_net_PlainDatagramSocketImpl.h
@@ -10,15 +10,15 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_bind (JNIEnv *env, jobject, jint, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_sendto (JNIEnv *env, jobject, jobject, jint, jbyteArray, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_receive0 (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
-extern JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_getOption (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_close (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_join (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_leave (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_bind (JNIEnv *env, jobject, jint, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_create (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_sendto (JNIEnv *env, jobject, jobject, jint, jbyteArray, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_receive0 (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
+JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_getOption (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_close (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_join (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_leave (JNIEnv *env, jobject, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_net_PlainSocketImpl.h b/include/gnu_java_net_PlainSocketImpl.h
index 9c09c2536..b49e139b7 100644
--- a/include/gnu_java_net_PlainSocketImpl.h
+++ b/include/gnu_java_net_PlainSocketImpl.h
@@ -10,17 +10,17 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
-extern JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainSocketImpl_getOption (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_create (JNIEnv *env, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_connect (JNIEnv *env, jobject, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_bind (JNIEnv *env, jobject, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_listen (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_accept (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_net_PlainSocketImpl_available (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_close (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_net_PlainSocketImpl_read (JNIEnv *env, jobject, jbyteArray, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_write (JNIEnv *env, jobject, jbyteArray, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
+JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainSocketImpl_getOption (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_create (JNIEnv *env, jobject, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_connect (JNIEnv *env, jobject, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_bind (JNIEnv *env, jobject, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_listen (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_accept (JNIEnv *env, jobject, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_net_PlainSocketImpl_available (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_close (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_net_PlainSocketImpl_read (JNIEnv *env, jobject, jbyteArray, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_write (JNIEnv *env, jobject, jbyteArray, jint, jint);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_nio_MappedByteFileBuffer.h b/include/gnu_java_nio_MappedByteFileBuffer.h
deleted file mode 100644
index 134942e77..000000000
--- a/include/gnu_java_nio_MappedByteFileBuffer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_nio_MappedByteFileBuffer__
-#define __gnu_java_nio_MappedByteFileBuffer__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern jbyte Java_gnu_java_nio_MappedByteFileBuffer_nio_1read_1Byte_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong);
-extern void Java_gnu_java_nio_MappedByteFileBuffer_nio_1write_1Byte_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jbyte, jlong);
-extern jshort Java_gnu_java_nio_MappedByteFileBuffer_nio_1read_1Short_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong);
-extern void Java_gnu_java_nio_MappedByteFileBuffer_nio_1write_1Short_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jshort, jlong);
-extern jchar Java_gnu_java_nio_MappedByteFileBuffer_nio_1read_1Char_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong);
-extern void Java_gnu_java_nio_MappedByteFileBuffer_nio_1write_1Char_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jchar, jlong);
-extern jint Java_gnu_java_nio_MappedByteFileBuffer_nio_1read_1Int_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong);
-extern void Java_gnu_java_nio_MappedByteFileBuffer_nio_1write_1Int_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jint, jlong);
-extern jlong Java_gnu_java_nio_MappedByteFileBuffer_nio_1read_1Long_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong);
-extern void Java_gnu_java_nio_MappedByteFileBuffer_nio_1write_1Long_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong, jlong);
-extern jfloat Java_gnu_java_nio_MappedByteFileBuffer_nio_1read_1Float_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong);
-extern void Java_gnu_java_nio_MappedByteFileBuffer_nio_1write_1Float_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jfloat, jlong);
-extern jdouble Java_gnu_java_nio_MappedByteFileBuffer_nio_1read_1Double_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jlong);
-extern void Java_gnu_java_nio_MappedByteFileBuffer_nio_1write_1Double_1file_1channel (JNIEnv *env, jclass, jobject, jint, jint, jdouble, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gnu_java_nio_MappedByteFileBuffer__ */
diff --git a/include/gnu_java_nio_NIOServerSocket.h b/include/gnu_java_nio_NIOServerSocket.h
index cd6465c72..1eaa69964 100644
--- a/include/gnu_java_nio_NIOServerSocket.h
+++ b/include/gnu_java_nio_NIOServerSocket.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT jobject JNICALL Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jobject);
+JNIEXPORT jobject JNICALL Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_nio_PipeImpl.h b/include/gnu_java_nio_PipeImpl.h
index a774e87b0..4c542c3bf 100644
--- a/include/gnu_java_nio_PipeImpl.h
+++ b/include/gnu_java_nio_PipeImpl.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_PipeImpl_nativeInit (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_nio_PipeImpl_nativeInit (JNIEnv *env, jobject, jobject);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_nio_SelectorImpl.h b/include/gnu_java_nio_SelectorImpl.h
index 2131bf554..b199f8950 100644
--- a/include/gnu_java_nio_SelectorImpl.h
+++ b/include/gnu_java_nio_SelectorImpl.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT jint JNICALL Java_gnu_java_nio_SelectorImpl_implSelect (JNIEnv *env, jclass, jintArray, jintArray, jintArray, jlong);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_SelectorImpl_implSelect (JNIEnv *env, jclass, jintArray, jintArray, jintArray, jlong);
#ifdef __cplusplus
}
diff --git a/include/gnu_java_nio_channels_FileChannelImpl.h b/include/gnu_java_nio_channels_FileChannelImpl.h
index be21e56df..2795e945f 100644
--- a/include/gnu_java_nio_channels_FileChannelImpl.h
+++ b/include/gnu_java_nio_channels_FileChannelImpl.h
@@ -10,21 +10,21 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_init (JNIEnv *env, jclass);
-extern JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_open (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_available (JNIEnv *env, jobject);
-extern JNIEXPORT jlong JNICALL Java_gnu_java_nio_channels_FileChannelImpl_implPosition (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_seek (JNIEnv *env, jobject, jlong);
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_implTruncate (JNIEnv *env, jobject, jlong);
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_unlock (JNIEnv *env, jobject, jlong, jlong);
-extern JNIEXPORT jlong JNICALL Java_gnu_java_nio_channels_FileChannelImpl_size (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_implCloseChannel (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_read__ (JNIEnv *env, jobject);
-extern JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_read___3BII (JNIEnv *env, jobject, jbyteArray, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write___3BII (JNIEnv *env, jobject, jbyteArray, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write__I (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jobject JNICALL Java_gnu_java_nio_channels_FileChannelImpl_mapImpl (JNIEnv *env, jobject, jchar, jlong, jint);
-extern JNIEXPORT jboolean JNICALL Java_gnu_java_nio_channels_FileChannelImpl_lock (JNIEnv *env, jobject, jlong, jlong, jboolean, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_init (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_open (JNIEnv *env, jobject, jstring, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_available (JNIEnv *env, jobject);
+JNIEXPORT jlong JNICALL Java_gnu_java_nio_channels_FileChannelImpl_implPosition (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_seek (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_implTruncate (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_unlock (JNIEnv *env, jobject, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_gnu_java_nio_channels_FileChannelImpl_size (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_implCloseChannel (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_read__ (JNIEnv *env, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_read___3BII (JNIEnv *env, jobject, jbyteArray, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write___3BII (JNIEnv *env, jobject, jbyteArray, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write__I (JNIEnv *env, jobject, jint);
+JNIEXPORT jobject JNICALL Java_gnu_java_nio_channels_FileChannelImpl_mapImpl (JNIEnv *env, jobject, jchar, jlong, jint);
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_channels_FileChannelImpl_lock (JNIEnv *env, jobject, jlong, jlong, jboolean, jboolean);
#ifdef __cplusplus
}
diff --git a/include/java_io_ObjectInputStream.h b/include/java_io_ObjectInputStream.h
index 404999e95..66e53ed1a 100644
--- a/include/java_io_ObjectInputStream.h
+++ b/include/java_io_ObjectInputStream.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT jobject JNICALL Java_java_io_ObjectInputStream_currentClassLoader (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT jobject JNICALL Java_java_io_ObjectInputStream_allocateObject (JNIEnv *env, jobject, jclass);
-extern JNIEXPORT void JNICALL Java_java_io_ObjectInputStream_callConstructor (JNIEnv *env, jobject, jclass, jobject);
+JNIEXPORT jobject JNICALL Java_java_io_ObjectInputStream_currentClassLoader (JNIEnv *env, jclass, jobject);
+JNIEXPORT jobject JNICALL Java_java_io_ObjectInputStream_allocateObject (JNIEnv *env, jobject, jclass);
+JNIEXPORT void JNICALL Java_java_io_ObjectInputStream_callConstructor (JNIEnv *env, jobject, jclass, jobject);
#ifdef __cplusplus
}
diff --git a/include/java_io_VMFile.h b/include/java_io_VMFile.h
index e88d77e90..e477bcf19 100644
--- a/include/java_io_VMFile.h
+++ b/include/java_io_VMFile.h
@@ -10,20 +10,20 @@ extern "C"
{
#endif
-extern JNIEXPORT jlong JNICALL Java_java_io_VMFile_lastModified (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_setReadOnly (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_create (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobjectArray JNICALL Java_java_io_VMFile_list (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_renameTo (JNIEnv *env, jclass, jstring, jstring);
-extern JNIEXPORT jlong JNICALL Java_java_io_VMFile_length (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_exists (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_delete (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_setLastModified (JNIEnv *env, jclass, jstring, jlong);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_mkdir (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isFile (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canWrite (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canRead (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isDirectory (JNIEnv *env, jclass, jstring);
+JNIEXPORT jlong JNICALL Java_java_io_VMFile_lastModified (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_setReadOnly (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_create (JNIEnv *env, jclass, jstring);
+JNIEXPORT jobjectArray JNICALL Java_java_io_VMFile_list (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_renameTo (JNIEnv *env, jclass, jstring, jstring);
+JNIEXPORT jlong JNICALL Java_java_io_VMFile_length (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_exists (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_delete (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_setLastModified (JNIEnv *env, jclass, jstring, jlong);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_mkdir (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isFile (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canWrite (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canRead (JNIEnv *env, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isDirectory (JNIEnv *env, jclass, jstring);
#ifdef __cplusplus
}
diff --git a/include/java_io_VMObjectStreamClass.h b/include/java_io_VMObjectStreamClass.h
index 761f18702..d131056ba 100644
--- a/include/java_io_VMObjectStreamClass.h
+++ b/include/java_io_VMObjectStreamClass.h
@@ -10,16 +10,16 @@ extern "C"
{
#endif
-extern JNIEXPORT jboolean JNICALL Java_java_io_VMObjectStreamClass_hasClassInitializer (JNIEnv *env, jclass, jclass);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setDoubleNative (JNIEnv *env, jclass, jobject, jobject, jdouble);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setFloatNative (JNIEnv *env, jclass, jobject, jobject, jfloat);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setLongNative (JNIEnv *env, jclass, jobject, jobject, jlong);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setIntNative (JNIEnv *env, jclass, jobject, jobject, jint);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setShortNative (JNIEnv *env, jclass, jobject, jobject, jshort);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setCharNative (JNIEnv *env, jclass, jobject, jobject, jchar);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setByteNative (JNIEnv *env, jclass, jobject, jobject, jbyte);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setBooleanNative (JNIEnv *env, jclass, jobject, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setObjectNative (JNIEnv *env, jclass, jobject, jobject, jobject);
+JNIEXPORT jboolean JNICALL Java_java_io_VMObjectStreamClass_hasClassInitializer (JNIEnv *env, jclass, jclass);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setDoubleNative (JNIEnv *env, jclass, jobject, jobject, jdouble);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setFloatNative (JNIEnv *env, jclass, jobject, jobject, jfloat);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setLongNative (JNIEnv *env, jclass, jobject, jobject, jlong);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setIntNative (JNIEnv *env, jclass, jobject, jobject, jint);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setShortNative (JNIEnv *env, jclass, jobject, jobject, jshort);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setCharNative (JNIEnv *env, jclass, jobject, jobject, jchar);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setByteNative (JNIEnv *env, jclass, jobject, jobject, jbyte);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setBooleanNative (JNIEnv *env, jclass, jobject, jobject, jboolean);
+JNIEXPORT void JNICALL Java_java_io_VMObjectStreamClass_setObjectNative (JNIEnv *env, jclass, jobject, jobject, jobject);
#ifdef __cplusplus
}
diff --git a/include/java_lang_Double.h b/include/java_lang_Double.h
index 7ea7004f7..625e2493c 100644
--- a/include/java_lang_Double.h
+++ b/include/java_lang_Double.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jstring JNICALL Java_java_lang_Double_toString (JNIEnv *env, jclass, jdouble, jboolean);
-extern JNIEXPORT void JNICALL Java_java_lang_Double_initIDs (JNIEnv *env, jclass);
+JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble (JNIEnv *env, jclass, jstring);
+JNIEXPORT jstring JNICALL Java_java_lang_Double_toString (JNIEnv *env, jclass, jdouble, jboolean);
+JNIEXPORT void JNICALL Java_java_lang_Double_initIDs (JNIEnv *env, jclass);
#ifdef __cplusplus
}
diff --git a/include/java_lang_Math.h b/include/java_lang_Math.h
index ac3708744..6211d2955 100644
--- a/include/java_lang_Math.h
+++ b/include/java_lang_Math.h
@@ -10,21 +10,21 @@ extern "C"
{
#endif
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_sin (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_cos (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_tan (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_asin (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_acos (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_atan (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_atan2 (JNIEnv *env, jclass, jdouble, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_exp (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_log (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_sqrt (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_pow (JNIEnv *env, jclass, jdouble, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_IEEEremainder (JNIEnv *env, jclass, jdouble, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_ceil (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_floor (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_Math_rint (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_sin (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_cos (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_tan (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_asin (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_acos (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_atan (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_atan2 (JNIEnv *env, jclass, jdouble, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_exp (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_log (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_sqrt (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_pow (JNIEnv *env, jclass, jdouble, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_IEEEremainder (JNIEnv *env, jclass, jdouble, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_ceil (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_floor (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_Math_rint (JNIEnv *env, jclass, jdouble);
#ifdef __cplusplus
}
diff --git a/include/java_lang_Object.h b/include/java_lang_Object.h
index 23a288780..fd914b64c 100644
--- a/include/java_lang_Object.h
+++ b/include/java_lang_Object.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass (JNIEnv *env, jobject);
+JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/java_lang_Thread.h b/include/java_lang_Thread.h
deleted file mode 100644
index a62acc553..000000000
--- a/include/java_lang_Thread.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_Thread__
-#define __java_lang_Thread__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern jobject Java_java_lang_Thread_currentThread (JNIEnv *env, jclass);
-extern void Java_java_lang_Thread_yield (JNIEnv *env, jclass);
-extern void Java_java_lang_Thread_sleep__JI (JNIEnv *env, jclass, jlong, jint);
-extern void Java_java_lang_Thread_start (JNIEnv *env, jobject);
-extern jboolean Java_java_lang_Thread_interrupted (JNIEnv *env, jclass);
-extern jboolean Java_java_lang_Thread_isInterrupted (JNIEnv *env, jobject);
-extern jboolean Java_java_lang_Thread_isAlive (JNIEnv *env, jobject);
-extern jint Java_java_lang_Thread_countStackFrames (JNIEnv *env, jobject);
-extern jboolean Java_java_lang_Thread_holdsLock (JNIEnv *env, jclass, jobject);
-extern void Java_java_lang_Thread_nativeInit (JNIEnv *env, jobject, jlong);
-extern void Java_java_lang_Thread_nativeStop (JNIEnv *env, jobject, jthrowable);
-extern void Java_java_lang_Thread_nativeInterrupt (JNIEnv *env, jobject);
-extern void Java_java_lang_Thread_nativeSuspend (JNIEnv *env, jobject);
-extern void Java_java_lang_Thread_nativeResume (JNIEnv *env, jobject);
-extern void Java_java_lang_Thread_nativeSetPriority (JNIEnv *env, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_Thread__ */
diff --git a/include/java_lang_VMClass.h b/include/java_lang_VMClass.h
deleted file mode 100644
index f7cb42dfc..000000000
--- a/include/java_lang_VMClass.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_VMClass__
-#define __java_lang_VMClass__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern jboolean Java_java_lang_VMClass_isInitialized (JNIEnv *env, jobject);
-extern void Java_java_lang_VMClass_setInitialized (JNIEnv *env, jobject);
-extern void Java_java_lang_VMClass_step7 (JNIEnv *env, jobject);
-extern void Java_java_lang_VMClass_step8 (JNIEnv *env, jobject);
-extern jboolean Java_java_lang_VMClass_isInstance (JNIEnv *env, jobject, jobject);
-extern jboolean Java_java_lang_VMClass_isAssignableFrom (JNIEnv *env, jobject, jclass);
-extern jboolean Java_java_lang_VMClass_isInterface (JNIEnv *env, jobject);
-extern jboolean Java_java_lang_VMClass_isPrimitive (JNIEnv *env, jobject);
-extern jstring Java_java_lang_VMClass_getName (JNIEnv *env, jobject);
-extern jclass Java_java_lang_VMClass_getSuperclass (JNIEnv *env, jobject);
-extern jobjectArray Java_java_lang_VMClass_getInterfaces (JNIEnv *env, jobject);
-extern jclass Java_java_lang_VMClass_getComponentType (JNIEnv *env, jobject);
-extern jint Java_java_lang_VMClass_getModifiers (JNIEnv *env, jobject);
-extern jclass Java_java_lang_VMClass_getDeclaringClass (JNIEnv *env, jobject);
-extern jobjectArray Java_java_lang_VMClass_getDeclaredClasses (JNIEnv *env, jobject, jboolean);
-extern jobjectArray Java_java_lang_VMClass_getDeclaredFields (JNIEnv *env, jobject, jboolean);
-extern jobjectArray Java_java_lang_VMClass_getDeclaredMethods (JNIEnv *env, jobject, jboolean);
-extern jobjectArray Java_java_lang_VMClass_getDeclaredConstructors (JNIEnv *env, jobject, jboolean);
-extern jobject Java_java_lang_VMClass_getClassLoader (JNIEnv *env, jobject);
-extern jclass Java_java_lang_VMClass_forName (JNIEnv *env, jclass, jstring);
-extern jint Java_java_lang_VMClass_isArray (JNIEnv *env, jobject);
-extern void Java_java_lang_VMClass_initialize__ (JNIEnv *env, jobject);
-extern jclass Java_java_lang_VMClass_loadArrayClass (JNIEnv *env, jclass, jstring, jobject);
-extern void Java_java_lang_VMClass_throwException (JNIEnv *env, jclass, jthrowable);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_VMClass__ */
diff --git a/include/java_lang_VMDouble.h b/include/java_lang_VMDouble.h
index 36d4fd004..ef2b969d1 100644
--- a/include/java_lang_VMDouble.h
+++ b/include/java_lang_VMDouble.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToLongBits (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToRawLongBits (JNIEnv *env, jclass, jdouble);
-extern JNIEXPORT jdouble JNICALL Java_java_lang_VMDouble_longBitsToDouble (JNIEnv *env, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToLongBits (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToRawLongBits (JNIEnv *env, jclass, jdouble);
+JNIEXPORT jdouble JNICALL Java_java_lang_VMDouble_longBitsToDouble (JNIEnv *env, jclass, jlong);
#ifdef __cplusplus
}
diff --git a/include/java_lang_VMFloat.h b/include/java_lang_VMFloat.h
index ea194848c..ed5df7f96 100644
--- a/include/java_lang_VMFloat.h
+++ b/include/java_lang_VMFloat.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToIntBits (JNIEnv *env, jclass, jfloat);
-extern JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToRawIntBits (JNIEnv *env, jclass, jfloat);
-extern JNIEXPORT jfloat JNICALL Java_java_lang_VMFloat_intBitsToFloat (JNIEnv *env, jclass, jint);
+JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToIntBits (JNIEnv *env, jclass, jfloat);
+JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToRawIntBits (JNIEnv *env, jclass, jfloat);
+JNIEXPORT jfloat JNICALL Java_java_lang_VMFloat_intBitsToFloat (JNIEnv *env, jclass, jint);
#ifdef __cplusplus
}
diff --git a/include/java_lang_VMProcess.h b/include/java_lang_VMProcess.h
index e5ca6cf9c..b39cb2c95 100644
--- a/include/java_lang_VMProcess.h
+++ b/include/java_lang_VMProcess.h
@@ -10,9 +10,9 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_java_lang_VMProcess_nativeSpawn (JNIEnv *env, jobject, jobjectArray, jobjectArray, jobject);
-extern JNIEXPORT jboolean JNICALL Java_java_lang_VMProcess_nativeReap (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_java_lang_VMProcess_nativeKill (JNIEnv *env, jclass, jlong);
+JNIEXPORT void JNICALL Java_java_lang_VMProcess_nativeSpawn (JNIEnv *env, jobject, jobjectArray, jobjectArray, jobject);
+JNIEXPORT jboolean JNICALL Java_java_lang_VMProcess_nativeReap (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_java_lang_VMProcess_nativeKill (JNIEnv *env, jclass, jlong);
#ifdef __cplusplus
}
diff --git a/include/java_lang_VMRuntime.h b/include/java_lang_VMRuntime.h
deleted file mode 100644
index 8999a3603..000000000
--- a/include/java_lang_VMRuntime.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_VMRuntime__
-#define __java_lang_VMRuntime__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern JNIEXPORT jint JNICALL Java_java_lang_VMRuntime_availableProcessors (JNIEnv *env, jclass);
-extern JNIEXPORT jlong JNICALL Java_java_lang_VMRuntime_freeMemory (JNIEnv *env, jclass);
-extern JNIEXPORT jlong JNICALL Java_java_lang_VMRuntime_totalMemory (JNIEnv *env, jclass);
-extern JNIEXPORT jlong JNICALL Java_java_lang_VMRuntime_maxMemory (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_gc (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_runFinalization (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_runFinalizationForExit (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_traceInstructions (JNIEnv *env, jclass, jboolean);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_traceMethodCalls (JNIEnv *env, jclass, jboolean);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_runFinalizersOnExit (JNIEnv *env, jclass, jboolean);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_exit (JNIEnv *env, jclass, jint);
-extern JNIEXPORT jint JNICALL Java_java_lang_VMRuntime_nativeLoad (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jstring JNICALL Java_java_lang_VMRuntime_nativeGetLibname (JNIEnv *env, jclass, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_java_lang_VMRuntime_insertSystemProperties (JNIEnv *env, jclass, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_VMRuntime__ */
diff --git a/include/java_lang_VMSystem.h b/include/java_lang_VMSystem.h
index f194be52e..d055abc9e 100644
--- a/include/java_lang_VMSystem.h
+++ b/include/java_lang_VMSystem.h
@@ -10,13 +10,13 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_arraycopy (JNIEnv *env, jclass, jobject, jint, jobject, jint, jint);
-extern JNIEXPORT jint JNICALL Java_java_lang_VMSystem_identityHashCode (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT jboolean JNICALL Java_java_lang_VMSystem_isWordsBigEndian (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_setIn (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_setOut (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_setErr (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT jlong JNICALL Java_java_lang_VMSystem_currentTimeMillis (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_arraycopy (JNIEnv *env, jclass, jobject, jint, jobject, jint, jint);
+JNIEXPORT jint JNICALL Java_java_lang_VMSystem_identityHashCode (JNIEnv *env, jclass, jobject);
+JNIEXPORT jboolean JNICALL Java_java_lang_VMSystem_isWordsBigEndian (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_setIn (JNIEnv *env, jclass, jobject);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_setOut (JNIEnv *env, jclass, jobject);
+JNIEXPORT void JNICALL Java_java_lang_VMSystem_setErr (JNIEnv *env, jclass, jobject);
+JNIEXPORT jlong JNICALL Java_java_lang_VMSystem_currentTimeMillis (JNIEnv *env, jclass);
#ifdef __cplusplus
}
diff --git a/include/java_lang_reflect_Array.h b/include/java_lang_reflect_Array.h
index 9154b7c28..4f7156f1e 100644
--- a/include/java_lang_reflect_Array.h
+++ b/include/java_lang_reflect_Array.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT jobject JNICALL Java_java_lang_reflect_Array_createObjectArray (JNIEnv *env, jclass, jclass, jint);
+JNIEXPORT jobject JNICALL Java_java_lang_reflect_Array_createObjectArray (JNIEnv *env, jclass, jclass, jint);
#ifdef __cplusplus
}
diff --git a/include/java_lang_reflect_Constructor.h b/include/java_lang_reflect_Constructor.h
deleted file mode 100644
index ae49daaf6..000000000
--- a/include/java_lang_reflect_Constructor.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_reflect_Constructor__
-#define __java_lang_reflect_Constructor__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern jint Java_java_lang_reflect_Constructor_getModifiers (JNIEnv *env, jobject);
-extern jobject Java_java_lang_reflect_Constructor_constructNative (JNIEnv *env, jobject, jobjectArray, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_reflect_Constructor__ */
diff --git a/include/java_lang_reflect_Field.h b/include/java_lang_reflect_Field.h
deleted file mode 100644
index bdf1d8ab4..000000000
--- a/include/java_lang_reflect_Field.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_reflect_Field__
-#define __java_lang_reflect_Field__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern jint Java_java_lang_reflect_Field_getModifiers (JNIEnv *env, jobject);
-extern jclass Java_java_lang_reflect_Field_getType (JNIEnv *env, jobject);
-extern jobject Java_java_lang_reflect_Field_get (JNIEnv *env, jobject, jobject);
-extern jboolean Java_java_lang_reflect_Field_getBoolean (JNIEnv *env, jobject, jobject);
-extern jbyte Java_java_lang_reflect_Field_getByte (JNIEnv *env, jobject, jobject);
-extern jchar Java_java_lang_reflect_Field_getChar (JNIEnv *env, jobject, jobject);
-extern jshort Java_java_lang_reflect_Field_getShort (JNIEnv *env, jobject, jobject);
-extern jint Java_java_lang_reflect_Field_getInt (JNIEnv *env, jobject, jobject);
-extern jlong Java_java_lang_reflect_Field_getLong (JNIEnv *env, jobject, jobject);
-extern jfloat Java_java_lang_reflect_Field_getFloat (JNIEnv *env, jobject, jobject);
-extern jdouble Java_java_lang_reflect_Field_getDouble (JNIEnv *env, jobject, jobject);
-extern void Java_java_lang_reflect_Field_set (JNIEnv *env, jobject, jobject, jobject);
-extern void Java_java_lang_reflect_Field_setBoolean (JNIEnv *env, jobject, jobject, jboolean);
-extern void Java_java_lang_reflect_Field_setByte (JNIEnv *env, jobject, jobject, jbyte);
-extern void Java_java_lang_reflect_Field_setChar (JNIEnv *env, jobject, jobject, jchar);
-extern void Java_java_lang_reflect_Field_setShort (JNIEnv *env, jobject, jobject, jshort);
-extern void Java_java_lang_reflect_Field_setInt (JNIEnv *env, jobject, jobject, jint);
-extern void Java_java_lang_reflect_Field_setLong (JNIEnv *env, jobject, jobject, jlong);
-extern void Java_java_lang_reflect_Field_setFloat (JNIEnv *env, jobject, jobject, jfloat);
-extern void Java_java_lang_reflect_Field_setDouble (JNIEnv *env, jobject, jobject, jdouble);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_reflect_Field__ */
diff --git a/include/java_lang_reflect_Method.h b/include/java_lang_reflect_Method.h
deleted file mode 100644
index c7235ef78..000000000
--- a/include/java_lang_reflect_Method.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_reflect_Method__
-#define __java_lang_reflect_Method__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern jint Java_java_lang_reflect_Method_getModifiers (JNIEnv *env, jobject);
-extern jclass Java_java_lang_reflect_Method_getReturnType (JNIEnv *env, jobject);
-extern jobjectArray Java_java_lang_reflect_Method_getParameterTypes (JNIEnv *env, jobject);
-extern jobjectArray Java_java_lang_reflect_Method_getExceptionTypes (JNIEnv *env, jobject);
-extern jobject Java_java_lang_reflect_Method_invokeNative (JNIEnv *env, jobject, jobject, jobjectArray, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_reflect_Method__ */
diff --git a/include/java_lang_reflect_Proxy.h b/include/java_lang_reflect_Proxy.h
deleted file mode 100644
index 5ffe4965d..000000000
--- a/include/java_lang_reflect_Proxy.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_reflect_Proxy__
-#define __java_lang_reflect_Proxy__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern jclass Java_java_lang_reflect_Proxy_getProxyClass0 (JNIEnv *env, jclass, jobject, jobjectArray);
-extern jobject Java_java_lang_reflect_Proxy_getProxyData0 (JNIEnv *env, jclass, jobject, jobjectArray);
-extern jclass Java_java_lang_reflect_Proxy_generateProxyClass0 (JNIEnv *env, jclass, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_reflect_Proxy__ */
diff --git a/include/java_net_InetAddress.h b/include/java_net_InetAddress.h
index c4f8ca269..450c66e18 100644
--- a/include/java_net_InetAddress.h
+++ b/include/java_net_InetAddress.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT jstring JNICALL Java_java_net_InetAddress_getLocalHostname (JNIEnv *env, jclass);
-extern JNIEXPORT jbyteArray JNICALL Java_java_net_InetAddress_lookupInaddrAny (JNIEnv *env, jclass);
-extern JNIEXPORT jstring JNICALL Java_java_net_InetAddress_getHostByAddr (JNIEnv *env, jclass, jbyteArray);
-extern JNIEXPORT jobjectArray JNICALL Java_java_net_InetAddress_getHostByName (JNIEnv *env, jclass, jstring);
+JNIEXPORT jstring JNICALL Java_java_net_InetAddress_getLocalHostname (JNIEnv *env, jclass);
+JNIEXPORT jbyteArray JNICALL Java_java_net_InetAddress_lookupInaddrAny (JNIEnv *env, jclass);
+JNIEXPORT jstring JNICALL Java_java_net_InetAddress_getHostByAddr (JNIEnv *env, jclass, jbyteArray);
+JNIEXPORT jobjectArray JNICALL Java_java_net_InetAddress_getHostByName (JNIEnv *env, jclass, jstring);
#ifdef __cplusplus
}
diff --git a/include/java_net_NetworkInterface.h b/include/java_net_NetworkInterface.h
index d579e49d9..3a7078290 100644
--- a/include/java_net_NetworkInterface.h
+++ b/include/java_net_NetworkInterface.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT jobject JNICALL Java_java_net_NetworkInterface_getRealNetworkInterfaces (JNIEnv *env, jclass);
+JNIEXPORT jobject JNICALL Java_java_net_NetworkInterface_getRealNetworkInterfaces (JNIEnv *env, jclass);
#ifdef __cplusplus
}
diff --git a/include/java_nio_DirectByteBufferImpl.h b/include/java_nio_DirectByteBufferImpl.h
index 9c09719b6..34be56e0e 100644
--- a/include/java_nio_DirectByteBufferImpl.h
+++ b/include/java_nio_DirectByteBufferImpl.h
@@ -10,13 +10,13 @@ extern "C"
{
#endif
-extern JNIEXPORT jobject JNICALL Java_java_nio_DirectByteBufferImpl_allocateImpl (JNIEnv *env, jclass, jint);
-extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_freeImpl (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT jbyte JNICALL Java_java_nio_DirectByteBufferImpl_getImpl__Lgnu_classpath_RawData_2I (JNIEnv *env, jclass, jobject, jint);
-extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_putImpl (JNIEnv *env, jclass, jobject, jint, jbyte);
-extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_getImpl__Lgnu_classpath_RawData_2I_3BII (JNIEnv *env, jclass, jobject, jint, jbyteArray, jint, jint);
-extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jclass, jobject, jint, jint, jint);
-extern JNIEXPORT jobject JNICALL Java_java_nio_DirectByteBufferImpl_adjustAddress (JNIEnv *env, jclass, jobject, jint);
+JNIEXPORT jobject JNICALL Java_java_nio_DirectByteBufferImpl_allocateImpl (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_freeImpl (JNIEnv *env, jclass, jobject);
+JNIEXPORT jbyte JNICALL Java_java_nio_DirectByteBufferImpl_getImpl__Lgnu_classpath_RawData_2I (JNIEnv *env, jclass, jobject, jint);
+JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_putImpl (JNIEnv *env, jclass, jobject, jint, jbyte);
+JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_getImpl__Lgnu_classpath_RawData_2I_3BII (JNIEnv *env, jclass, jobject, jint, jbyteArray, jint, jint);
+JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jclass, jobject, jint, jint, jint);
+JNIEXPORT jobject JNICALL Java_java_nio_DirectByteBufferImpl_adjustAddress (JNIEnv *env, jclass, jobject, jint);
#ifdef __cplusplus
}
diff --git a/include/java_nio_MappedByteBufferImpl.h b/include/java_nio_MappedByteBufferImpl.h
index d38a679b3..0ce8b9082 100644
--- a/include/java_nio_MappedByteBufferImpl.h
+++ b/include/java_nio_MappedByteBufferImpl.h
@@ -10,10 +10,10 @@ extern "C"
{
#endif
-extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_unmapImpl (JNIEnv *env, jobject);
-extern JNIEXPORT jboolean JNICALL Java_java_nio_MappedByteBufferImpl_isLoadedImpl (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_loadImpl (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_forceImpl (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_unmapImpl (JNIEnv *env, jobject);
+JNIEXPORT jboolean JNICALL Java_java_nio_MappedByteBufferImpl_isLoadedImpl (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_loadImpl (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_forceImpl (JNIEnv *env, jobject);
#ifdef __cplusplus
}
diff --git a/include/java_nio_channels_Channels.h b/include/java_nio_channels_Channels.h
index 345900e77..69a14dd1b 100644
--- a/include/java_nio_channels_Channels.h
+++ b/include/java_nio_channels_Channels.h
@@ -10,8 +10,8 @@ extern "C"
{
#endif
-extern JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newInputStream (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newOutputStream (JNIEnv *env, jclass, jobject);
+JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newInputStream (JNIEnv *env, jclass, jobject);
+JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newOutputStream (JNIEnv *env, jclass, jobject);
#ifdef __cplusplus
}
diff --git a/include/java_util_TimeZone.h b/include/java_util_TimeZone.h
index e658c17eb..2854c6634 100644
--- a/include/java_util_TimeZone.h
+++ b/include/java_util_TimeZone.h
@@ -10,7 +10,7 @@ extern "C"
{
#endif
-extern JNIEXPORT jstring JNICALL Java_java_util_TimeZone_getDefaultTimeZoneId (JNIEnv *env, jclass);
+JNIEXPORT jstring JNICALL Java_java_util_TimeZone_getDefaultTimeZoneId (JNIEnv *env, jclass);
#ifdef __cplusplus
}
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
index 9a221ed73..29d1ab79e 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
@@ -110,7 +110,8 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor
gdk_threads_leave ();
}
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus
(JNIEnv *env, jobject obj)
{
void *ptr;
@@ -576,7 +577,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_O
(*env)->ReleaseStringUTFChars (env, jname, name);
}
-gboolean
+static gboolean
filter_expose_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
{
/*
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
index a743cb014..41718017c 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
@@ -45,7 +45,7 @@ struct pos
gint y;
};
-void
+static void
menu_pos (GtkMenu *menu __attribute__((unused)),
gint *x, gint *y,
gboolean *push_in,