* native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t):

       Removed.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
       Mark all unused parameters.
       (cp_gtk_get_cairo_t): Removed.
       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix):
       Don't mix declerations and statements.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c:
       Mark all unused parameters.
       (Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface):
       Get cairographics2d pointer directly.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
       (Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout):
       Use jlong to pass pointer.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
       Mark all unused parameters.
       * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_GtkVolatileImage.h: Regenerated.
       * include/java_io_VMFile.h: Regenerated.

1 files changed, 16 insertions, 67 deletions

diff --git a/include/gnu_java_awt_peer_gtk_ComponentGraphics.h b/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
index f88ad592b..4fd597eff 100644
--- a/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
+++ b/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
@@ -1,77 +1,26 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_ComponentGraphics__
+#define __gnu_java_awt_peer_gtk_ComponentGraphics__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_ComponentGraphics */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_ComponentGraphics
-#define _Included_gnu_java_awt_peer_gtk_ComponentGraphics
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    initState
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    disposeSurface
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    initFromVolatile
- * Signature: (JII)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile
-  (JNIEnv *, jobject, jlong, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    start_gdk_drawing
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing
-  (JNIEnv *, jobject);
 
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    end_gdk_drawing
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing
-  (JNIEnv *, jobject);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    hasXRender
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    copyAreaNative
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;IIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative
-  (JNIEnv *, jobject, jobject, jint, jint, jint, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    drawVolatile
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;JIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile
-  (JNIEnv *, jobject, jobject, jlong, jint, jint, jint, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface (JNIEnv *env, jobject, jlong);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env, jobject, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
+JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_ComponentGraphics__ */