commit-classpath
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Header file cleanup and small function prototype fixes


From: Mark Wielaard
Subject: Header file cleanup and small function prototype fixes
Date: Fri, 21 May 2004 15:52:47 +0200

Hi,

When the GTK+ peers were merged into kaffe
(http://www.kaffe.org/pipermail/kaffe/2004-May/046306.html)
we noticed a couple of smaller issues with the header/include files.
The following patch tries to address them all.

2004-05-21  Mark Wielaard <address@hidden>
  
       * 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.

All header files are regenerated by the latest gcjh from CVS (which
removes the extern modifier from the .h file). Unused header files have
been removed. And some internal functions have been marked static. The
native method in GtkComponentPeer requestFocus is now called
gtkRequestFocus since to many JNI header generation programs had trouble
with getting the overloaded signature right (known bug in gcjh at
least).

No mauve regressions and test AWT programs still work.
Any comments/objections?

Cheers,

Mark
? native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c.mark
? native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c.mark
? native/jni/java-lang/java_lang_VMProcess.c.mark
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.61
diff -u -r1.61 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 19 Mar 2004 21:22:24 -0000      
1.61
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 21 May 2004 13:32:37 -0000
@@ -335,7 +335,15 @@
                                 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.
+  native private void gtkRequestFocus ();
 
   public void reshape (int x, int y, int width, int height) 
   {
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- include/Makefile.am 30 Apr 2004 08:29:46 -0000      1.19
+++ include/Makefile.am 21 May 2004 13:32:37 -0000
@@ -48,9 +48,9 @@
 $(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 @@
        $(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
Index: include/gnu_java_awt_EmbeddedWindow.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_EmbeddedWindow.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_EmbeddedWindow.h
--- include/gnu_java_awt_EmbeddedWindow.h       12 Feb 2004 16:53:09 -0000      
1.1
+++ include/gnu_java_awt_EmbeddedWindow.h       21 May 2004 13:32:37 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GdkFontMetrics.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GdkFontMetrics.h
--- include/gnu_java_awt_peer_gtk_GdkFontMetrics.h      30 Apr 2004 11:05:16 
-0000      1.4
+++ include/gnu_java_awt_peer_gtk_GdkFontMetrics.h      21 May 2004 13:32:37 
-0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GdkGraphics.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GdkGraphics.h
--- include/gnu_java_awt_peer_gtk_GdkGraphics.h 30 Apr 2004 11:05:16 -0000      
1.4
+++ include/gnu_java_awt_peer_gtk_GdkGraphics.h 21 May 2004 13:32:37 -0000
@@ -10,28 +10,28 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
--- include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h    25 Dec 2003 17:07:08 
-0000      1.3
+++ include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h    21 May 2004 13:32:37 
-0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkButtonPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkButtonPeer.h
--- include/gnu_java_awt_peer_gtk_GtkButtonPeer.h       10 Feb 2004 18:26:46 
-0000      1.6
+++ include/gnu_java_awt_peer_gtk_GtkButtonPeer.h       21 May 2004 13:32:37 
-0000
@@ -10,12 +10,12 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkCanvasPeer.h
--- include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h       30 Jul 2003 16:47:19 
-0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h       21 May 2004 13:32:37 
-0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h
--- include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h        30 Jul 2003 
16:47:19 -0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h        21 May 2004 
13:32:37 -0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h
--- include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h     30 Jul 2003 
16:47:19 -0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h     21 May 2004 
13:32:37 -0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
--- include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h     19 Mar 2004 21:25:56 
-0000      1.5
+++ include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h     21 May 2004 13:32:37 
-0000
@@ -10,11 +10,11 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkChoicePeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkChoicePeer.h
--- include/gnu_java_awt_peer_gtk_GtkChoicePeer.h       10 Jan 2004 22:42:19 
-0000      1.3
+++ include/gnu_java_awt_peer_gtk_GtkChoicePeer.h       21 May 2004 13:32:37 
-0000
@@ -10,12 +10,12 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkClipboard.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkClipboard.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkClipboard.h
--- include/gnu_java_awt_peer_gtk_GtkClipboard.h        30 Jul 2003 16:47:19 
-0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkClipboard.h        21 May 2004 13:32:37 
-0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkComponentPeer.h    19 Mar 2004 21:25:56 
-0000      1.9
+++ include/gnu_java_awt_peer_gtk_GtkComponentPeer.h    21 May 2004 13:32:37 
-0000
@@ -10,30 +10,30 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
--- include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h       30 Apr 2004 
11:05:16 -0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h       21 May 2004 
13:32:37 -0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
--- include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h   27 Jan 2004 18:16:56 
-0000      1.5
+++ include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h   21 May 2004 13:32:37 
-0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkFramePeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkFramePeer.h
--- include/gnu_java_awt_peer_gtk_GtkFramePeer.h        29 Jan 2004 14:51:51 
-0000      1.6
+++ include/gnu_java_awt_peer_gtk_GtkFramePeer.h        21 May 2004 13:32:37 
-0000
@@ -10,11 +10,11 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkGenericPeer.h
--- include/gnu_java_awt_peer_gtk_GtkGenericPeer.h      30 Jul 2003 16:47:19 
-0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkGenericPeer.h      21 May 2004 13:32:38 
-0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkImagePainter.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkImagePainter.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkImagePainter.h
--- include/gnu_java_awt_peer_gtk_GtkImagePainter.h     30 Jul 2003 16:47:19 
-0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkImagePainter.h     21 May 2004 13:32:38 
-0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkLabelPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkLabelPeer.h
--- include/gnu_java_awt_peer_gtk_GtkLabelPeer.h        30 Apr 2004 11:05:16 
-0000      1.5
+++ include/gnu_java_awt_peer_gtk_GtkLabelPeer.h        21 May 2004 13:32:38 
-0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkListPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkListPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkListPeer.h
--- include/gnu_java_awt_peer_gtk_GtkListPeer.h 7 Jan 2004 02:23:37 -0000       
1.3
+++ include/gnu_java_awt_peer_gtk_GtkListPeer.h 21 May 2004 13:32:38 -0000
@@ -10,18 +10,18 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkMainThread.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMainThread.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkMainThread.h
--- include/gnu_java_awt_peer_gtk_GtkMainThread.h       14 Aug 2003 16:47:20 
-0000      1.2
+++ include/gnu_java_awt_peer_gtk_GtkMainThread.h       21 May 2004 13:32:38 
-0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h      30 Apr 2004 11:05:16 
-0000      1.3
+++ include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h      21 May 2004 13:32:38 
-0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h        28 Jan 2004 
14:22:31 -0000      1.1
+++ include/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h        21 May 2004 
13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h     18 Apr 2004 15:41:17 
-0000      1.4
+++ include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h     21 May 2004 13:32:38 
-0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkMenuPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkMenuPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuPeer.h 30 Apr 2004 11:05:16 -0000      
1.3
+++ include/gnu_java_awt_peer_gtk_GtkMenuPeer.h 21 May 2004 13:32:38 -0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkPanelPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkPanelPeer.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkPanelPeer.h
--- include/gnu_java_awt_peer_gtk_GtkPanelPeer.h        18 Apr 2004 15:41:17 
-0000      1.4
+++ include/gnu_java_awt_peer_gtk_GtkPanelPeer.h        21 May 2004 13:32:38 
-0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h
--- include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h    30 Apr 2004 11:05:16 
-0000      1.3
+++ include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h    21 May 2004 13:32:38 
-0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
--- include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h   30 Apr 2004 11:05:16 
-0000      1.4
+++ include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h   21 May 2004 13:32:38 
-0000
@@ -10,14 +10,14 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
--- include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h    30 Apr 2004 11:05:16 
-0000      1.4
+++ include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h    21 May 2004 13:32:38 
-0000
@@ -10,12 +10,12 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h     30 Apr 2004 11:05:16 
-0000      1.7
+++ include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h     21 May 2004 13:32:38 
-0000
@@ -10,12 +10,12 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h        7 Jan 2004 
02:23:37 -0000       1.3
+++ include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h        21 May 2004 
13:32:38 -0000
@@ -10,15 +10,15 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h    30 Apr 2004 11:05:16 
-0000      1.7
+++ include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h    21 May 2004 13:32:38 
-0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkToolkit.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkToolkit.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkToolkit.h
--- include/gnu_java_awt_peer_gtk_GtkToolkit.h  25 Dec 2003 17:07:08 -0000      
1.4
+++ include/gnu_java_awt_peer_gtk_GtkToolkit.h  21 May 2004 13:32:38 -0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/gnu_java_awt_peer_gtk_GtkWindowPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkWindowPeer.h
--- include/gnu_java_awt_peer_gtk_GtkWindowPeer.h       30 Apr 2004 11:05:16 
-0000      1.9
+++ include/gnu_java_awt_peer_gtk_GtkWindowPeer.h       21 May 2004 13:32:38 
-0000
@@ -10,15 +10,15 @@
 {
 #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
 }
Index: include/gnu_java_net_PlainDatagramSocketImpl.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_net_PlainDatagramSocketImpl.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_net_PlainDatagramSocketImpl.h
--- include/gnu_java_net_PlainDatagramSocketImpl.h      28 Nov 2003 23:43:18 
-0000      1.2
+++ include/gnu_java_net_PlainDatagramSocketImpl.h      21 May 2004 13:32:38 
-0000
@@ -10,15 +10,15 @@
 {
 #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
 }
Index: include/gnu_java_net_PlainSocketImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_net_PlainSocketImpl.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_net_PlainSocketImpl.h
--- include/gnu_java_net_PlainSocketImpl.h      29 Apr 2004 16:46:44 -0000      
1.2
+++ include/gnu_java_net_PlainSocketImpl.h      21 May 2004 13:32:38 -0000
@@ -10,17 +10,17 @@
 {
 #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
 }
Index: include/gnu_java_nio_MappedByteFileBuffer.h
===================================================================
RCS file: include/gnu_java_nio_MappedByteFileBuffer.h
diff -N include/gnu_java_nio_MappedByteFileBuffer.h
--- include/gnu_java_nio_MappedByteFileBuffer.h 4 Apr 2003 04:55:40 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/gnu_java_nio_NIOServerSocket.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_nio_NIOServerSocket.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_NIOServerSocket.h
--- include/gnu_java_nio_NIOServerSocket.h      6 Jan 2004 11:45:58 -0000       
1.1
+++ include/gnu_java_nio_NIOServerSocket.h      21 May 2004 13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_nio_PipeImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_nio_PipeImpl.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_PipeImpl.h
--- include/gnu_java_nio_PipeImpl.h     8 Apr 2004 23:11:19 -0000       1.1
+++ include/gnu_java_nio_PipeImpl.h     21 May 2004 13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_nio_SelectorImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_nio_SelectorImpl.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_SelectorImpl.h
--- include/gnu_java_nio_SelectorImpl.h 8 Apr 2004 23:11:19 -0000       1.1
+++ include/gnu_java_nio_SelectorImpl.h 21 May 2004 13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/gnu_java_nio_channels_FileChannelImpl.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_nio_channels_FileChannelImpl.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_nio_channels_FileChannelImpl.h
--- include/gnu_java_nio_channels_FileChannelImpl.h     29 Apr 2004 16:46:44 
-0000      1.2
+++ include/gnu_java_nio_channels_FileChannelImpl.h     21 May 2004 13:32:38 
-0000
@@ -10,21 +10,21 @@
 {
 #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
 }
Index: include/java_io_ObjectInputStream.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_io_ObjectInputStream.h,v
retrieving revision 1.3
diff -u -r1.3 java_io_ObjectInputStream.h
--- include/java_io_ObjectInputStream.h 30 Jul 2003 16:47:19 -0000      1.3
+++ include/java_io_ObjectInputStream.h 21 May 2004 13:32:38 -0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/java_io_VMFile.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_io_VMFile.h,v
retrieving revision 1.1
diff -u -r1.1 java_io_VMFile.h
--- include/java_io_VMFile.h    26 Apr 2004 20:51:32 -0000      1.1
+++ include/java_io_VMFile.h    21 May 2004 13:32:38 -0000
@@ -10,20 +10,20 @@
 {
 #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
 }
Index: include/java_io_VMObjectStreamClass.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_io_VMObjectStreamClass.h,v
retrieving revision 1.2
diff -u -r1.2 java_io_VMObjectStreamClass.h
--- include/java_io_VMObjectStreamClass.h       8 Apr 2004 06:47:53 -0000       
1.2
+++ include/java_io_VMObjectStreamClass.h       21 May 2004 13:32:38 -0000
@@ -10,16 +10,16 @@
 {
 #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
 }
Index: include/java_lang_Double.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_Double.h,v
retrieving revision 1.4
diff -u -r1.4 java_lang_Double.h
--- include/java_lang_Double.h  5 May 2004 11:09:28 -0000       1.4
+++ include/java_lang_Double.h  21 May 2004 13:32:38 -0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/java_lang_Math.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_Math.h,v
retrieving revision 1.2
diff -u -r1.2 java_lang_Math.h
--- include/java_lang_Math.h    30 Jul 2003 16:47:19 -0000      1.2
+++ include/java_lang_Math.h    21 May 2004 13:32:38 -0000
@@ -10,21 +10,21 @@
 {
 #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
 }
Index: include/java_lang_Object.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_Object.h,v
retrieving revision 1.2
diff -u -r1.2 java_lang_Object.h
--- include/java_lang_Object.h  30 Jul 2003 16:47:19 -0000      1.2
+++ include/java_lang_Object.h  21 May 2004 13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/java_lang_Thread.h
===================================================================
RCS file: include/java_lang_Thread.h
diff -N include/java_lang_Thread.h
--- include/java_lang_Thread.h  4 Apr 2003 04:55:40 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/java_lang_VMClass.h
===================================================================
RCS file: include/java_lang_VMClass.h
diff -N include/java_lang_VMClass.h
--- include/java_lang_VMClass.h 17 Apr 2003 12:32:29 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/java_lang_VMDouble.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_VMDouble.h,v
retrieving revision 1.1
diff -u -r1.1 java_lang_VMDouble.h
--- include/java_lang_VMDouble.h        16 Jul 2003 12:21:07 -0000      1.1
+++ include/java_lang_VMDouble.h        21 May 2004 13:32:38 -0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/java_lang_VMFloat.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_VMFloat.h,v
retrieving revision 1.1
diff -u -r1.1 java_lang_VMFloat.h
--- include/java_lang_VMFloat.h 16 Jul 2003 12:21:07 -0000      1.1
+++ include/java_lang_VMFloat.h 21 May 2004 13:32:38 -0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/java_lang_VMProcess.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_VMProcess.h,v
retrieving revision 1.1
diff -u -r1.1 java_lang_VMProcess.h
--- include/java_lang_VMProcess.h       27 Apr 2004 22:56:05 -0000      1.1
+++ include/java_lang_VMProcess.h       21 May 2004 13:32:38 -0000
@@ -10,9 +10,9 @@
 {
 #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
 }
Index: include/java_lang_VMRuntime.h
===================================================================
RCS file: include/java_lang_VMRuntime.h
diff -N include/java_lang_VMRuntime.h
--- include/java_lang_VMRuntime.h       27 Apr 2004 22:56:05 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/java_lang_VMSystem.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_VMSystem.h,v
retrieving revision 1.3
diff -u -r1.3 java_lang_VMSystem.h
--- include/java_lang_VMSystem.h        25 Dec 2003 17:07:08 -0000      1.3
+++ include/java_lang_VMSystem.h        21 May 2004 13:32:38 -0000
@@ -10,13 +10,13 @@
 {
 #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
 }
Index: include/java_lang_reflect_Array.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_reflect_Array.h,v
retrieving revision 1.2
diff -u -r1.2 java_lang_reflect_Array.h
--- include/java_lang_reflect_Array.h   25 Sep 2003 14:08:06 -0000      1.2
+++ include/java_lang_reflect_Array.h   21 May 2004 13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/java_lang_reflect_Constructor.h
===================================================================
RCS file: include/java_lang_reflect_Constructor.h
diff -N include/java_lang_reflect_Constructor.h
--- include/java_lang_reflect_Constructor.h     9 Feb 2002 21:32:16 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/java_lang_reflect_Field.h
===================================================================
RCS file: include/java_lang_reflect_Field.h
diff -N include/java_lang_reflect_Field.h
--- include/java_lang_reflect_Field.h   9 Feb 2002 21:32:16 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/java_lang_reflect_Method.h
===================================================================
RCS file: include/java_lang_reflect_Method.h
diff -N include/java_lang_reflect_Method.h
--- include/java_lang_reflect_Method.h  9 Feb 2002 21:32:16 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/java_lang_reflect_Proxy.h
===================================================================
RCS file: include/java_lang_reflect_Proxy.h
diff -N include/java_lang_reflect_Proxy.h
--- include/java_lang_reflect_Proxy.h   9 Feb 2002 21:32:16 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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__ */
Index: include/java_net_InetAddress.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_net_InetAddress.h,v
retrieving revision 1.4
diff -u -r1.4 java_net_InetAddress.h
--- include/java_net_InetAddress.h      9 Oct 2003 15:59:57 -0000       1.4
+++ include/java_net_InetAddress.h      21 May 2004 13:32:38 -0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/java_net_NetworkInterface.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_net_NetworkInterface.h,v
retrieving revision 1.3
diff -u -r1.3 java_net_NetworkInterface.h
--- include/java_net_NetworkInterface.h 30 Jul 2003 16:47:19 -0000      1.3
+++ include/java_net_NetworkInterface.h 21 May 2004 13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: include/java_nio_DirectByteBufferImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_nio_DirectByteBufferImpl.h,v
retrieving revision 1.4
diff -u -r1.4 java_nio_DirectByteBufferImpl.h
--- include/java_nio_DirectByteBufferImpl.h     12 Apr 2004 12:55:12 -0000      
1.4
+++ include/java_nio_DirectByteBufferImpl.h     21 May 2004 13:32:38 -0000
@@ -10,13 +10,13 @@
 {
 #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
 }
Index: include/java_nio_MappedByteBufferImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_nio_MappedByteBufferImpl.h,v
retrieving revision 1.1
diff -u -r1.1 java_nio_MappedByteBufferImpl.h
--- include/java_nio_MappedByteBufferImpl.h     29 Apr 2004 14:37:06 -0000      
1.1
+++ include/java_nio_MappedByteBufferImpl.h     21 May 2004 13:32:38 -0000
@@ -10,10 +10,10 @@
 {
 #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
 }
Index: include/java_nio_channels_Channels.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_nio_channels_Channels.h,v
retrieving revision 1.1
diff -u -r1.1 java_nio_channels_Channels.h
--- include/java_nio_channels_Channels.h        30 Apr 2004 08:29:46 -0000      
1.1
+++ include/java_nio_channels_Channels.h        21 May 2004 13:32:38 -0000
@@ -10,8 +10,8 @@
 {
 #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
 }
Index: include/java_util_TimeZone.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_util_TimeZone.h,v
retrieving revision 1.2
diff -u -r1.2 java_util_TimeZone.h
--- include/java_util_TimeZone.h        30 Jul 2003 16:47:19 -0000      1.2
+++ include/java_util_TimeZone.h        21 May 2004 13:32:38 -0000
@@ -10,7 +10,7 @@
 {
 #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
 }
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.27
diff -u -r1.27 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c        20 May 
2004 14:05:17 -0000      1.27
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c        21 May 
2004 13:32:39 -0000
@@ -110,7 +110,8 @@
   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 @@
   (*env)->ReleaseStringUTFChars (env, jname, name);
 }
 
-gboolean
+static gboolean
 filter_expose_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
 {
   /*
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c        17 Apr 
2004 23:24:47 -0000      1.9
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c        21 May 
2004 13:32:39 -0000
@@ -45,7 +45,7 @@
   gint y;
 };
 
-void 
+static void 
 menu_pos (GtkMenu *menu __attribute__((unused)),
          gint *x, gint *y,
          gboolean *push_in,

Attachment: signature.asc
Description: This is a digitally signed message part


reply via email to

[Prev in Thread] Current Thread [Next in Thread]