[cp-patches] FYI: -Werror fixlet - move GtkImage func definitions to gtkpeer.h

[Mark Wielaard]

Hi,

--enable-Werror was broken since some GtkImage functions were used by
other native sources but never publicly declared. This patch moves them
to gtkpeer.h so they are automatically defined for all gtk-peer sources.

2005-06-19  Mark Wielaard  <address@hidden>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
        (gnu_java_awt_peer_gtk_GtkImage_getPixbuf,
        gnu_java_awt_peer_gtk_GtkImage_getPixmap,
        gnu_java_awt_peer_gtk_GtkImage_isOffScreen): Move declaration to ...
        * native/jni/gtk-peer/gtkpeer.h: here.

configuring with --enable-Werror works again with this.

Committed,

Mark

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkImage.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c        5 Jun 2005 
02:08:37 -0000       1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c        19 Jun 2005 
20:31:36 -0000
@@ -46,11 +46,6 @@
 #define SCALE_REPLICATE    8 
 #define SCALE_AREA_AVERAGING  16
 
-/* functions used by other gtk peer native routines */
-GdkPixbuf *gnu_java_awt_peer_gtk_GtkImage_getPixbuf(JNIEnv *env, jobject obj);
-GdkPixmap *gnu_java_awt_peer_gtk_GtkImage_getPixmap(JNIEnv *env, jobject obj);
-jboolean gnu_java_awt_peer_gtk_GtkImage_isOffScreen(JNIEnv *env, jobject obj);
-
 /* local stuff */
 static GdkInterpType mapHints(jint hints);
 static jboolean offScreen (JNIEnv * env, jobject obj);
Index: native/jni/gtk-peer/gtkpeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gtkpeer.h,v
retrieving revision 1.31
diff -u -r1.31 gtkpeer.h
--- native/jni/gtk-peer/gtkpeer.h       22 Feb 2005 07:40:44 -0000      1.31
+++ native/jni/gtk-peer/gtkpeer.h       19 Jun 2005 20:31:36 -0000
@@ -1,5 +1,5 @@
 /* gtkpeer.h -- Some global variables and #defines
-   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -504,6 +504,11 @@
   GtkWidget **widget;
 };
 
+/* GtkImage functions used by other gtk peer native routines */
+GdkPixbuf *gnu_java_awt_peer_gtk_GtkImage_getPixbuf(JNIEnv *env, jobject obj);
+GdkPixmap *gnu_java_awt_peer_gtk_GtkImage_getPixmap(JNIEnv *env, jobject obj);
+jboolean gnu_java_awt_peer_gtk_GtkImage_isOffScreen(JNIEnv *env, jobject obj);
+
 #define DEBUG_LOCKING 0
 
 #if DEBUG_LOCKING

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