* 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, 13 insertions, 59 deletions

diff --git a/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h b/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
index 2714535d4..43b55e828 100644
--- a/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
+++ b/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
@@ -1,69 +1,23 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__
+#define __gnu_java_awt_peer_gtk_GtkVolatileImage__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_GtkVolatileImage */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
-#define _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT 1L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST 2L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH 4L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE 8L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING 16L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK 0L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED 1L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE 2L
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    init
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;II)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init
-  (JNIEnv *, jobject, jobject, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    destroy
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeGetPixels
- * Signature: (J)[I
- */
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
-  (JNIEnv *, jobject, jlong);
 
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeCopyArea
- * Signature: (JIIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
-  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeDrawVolatile
- * Signature: (JJIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile
-  (JNIEnv *, jobject, jlong, jlong, jint, jint, jint, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject, jlong);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile (JNIEnv *env, jobject, jlong, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_GtkVolatileImage__ */