[Freeciv-Dev] Re: (PR#2260) [Patch] Extra casts

["Raimar Falke via RT" <rt@xxxxxxxxxxxxxx>]

On Mon, Oct 28, 2002 at 11:54:04AM -0800, Raimar Falke via RT wrote:
> On Mon, Oct 28, 2002 at 11:51:48AM -0800, Raimar Falke via RT wrote:
> > 
> > 
> > The attached patch adds some extra casts to make the intel compiler
> > happy.
> 
> And the patch.

And the patch to the mailing list.

        Raimar

Index: client/gui-gtk/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cityrep.c,v
retrieving revision 1.64
diff -u -r1.64 cityrep.c
--- client/gui-gtk/cityrep.c    2002/09/25 20:24:51     1.64
+++ client/gui-gtk/cityrep.c    2002/10/28 19:27:35
@@ -251,7 +251,8 @@
   cid cid = GPOINTER_TO_INT(data);
   gint i;
   GtkObject *parent = GTK_OBJECT(w->parent);
-  TestCityFunc test_func = gtk_object_get_data(parent, "freeciv_test_func");
+  TestCityFunc test_func =
+      (TestCityFunc) gtk_object_get_data(parent, "freeciv_test_func");
   bool change_prod = 
     GPOINTER_TO_INT(gtk_object_get_data(parent, "freeciv_change_prod"));
 
Index: client/gui-gtk/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/dialogs.c,v
retrieving revision 1.109
diff -u -r1.109 dialogs.c
--- client/gui-gtk/dialogs.c    2002/10/27 21:05:16     1.109
+++ client/gui-gtk/dialogs.c    2002/10/28 19:27:40
@@ -1422,7 +1422,8 @@
   GtkWidget *parent =
       gtk_object_get_data(GTK_OBJECT(dialog_shell), "parent");
   void (*close_callback) (gpointer) =
-      gtk_object_get_data(GTK_OBJECT(dialog_shell), "close_callback");
+      (void (*)(gpointer)) gtk_object_get_data(GTK_OBJECT(dialog_shell),
+                                              "close_callback");
   gpointer close_callback_data =
       gtk_object_get_data(GTK_OBJECT(dialog_shell), "close_callback_data");
   struct button_descr *buttons =
@@ -1451,7 +1452,8 @@
 {
   GtkWidget *dialog_shell = GTK_WIDGET(data);
   void (*close_callback) (gpointer) =
-      gtk_object_get_data(GTK_OBJECT(dialog_shell), "close_callback");
+      (void (*)(gpointer)) gtk_object_get_data(GTK_OBJECT(dialog_shell),
+                                              "close_callback");
 
   if (close_callback) {
     popup_mes_close(dialog_shell);
Index: client/gui-gtk/inputdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/inputdlg.c,v
retrieving revision 1.6
diff -u -r1.6 inputdlg.c
--- client/gui-gtk/inputdlg.c   2002/06/13 22:43:23     1.6
+++ client/gui-gtk/inputdlg.c   2002/10/28 19:27:40
@@ -32,8 +32,9 @@
 {
   GtkWidget *parent = gtk_object_get_data(GTK_OBJECT(shell),
                                          "parent");
-  void (*cancel_callback) (gpointer) = gtk_object_get_data(GTK_OBJECT(shell),
-                                                          "cancel_callback");
+  void (*cancel_callback) (gpointer) =
+      (void (*)(gpointer)) gtk_object_get_data(GTK_OBJECT(shell),
+                                              "cancel_callback");
   gpointer cancel_data = gtk_object_get_data(GTK_OBJECT(shell),
                                             "cancel_data");
 
@@ -53,6 +54,7 @@
   GtkWidget *parent = gtk_object_get_data(GTK_OBJECT(shell),
                                          "parent");
   void (*ok_callback) (const char *, gpointer) =
+      (void (*)(const char *, gpointer))
       gtk_object_get_data(GTK_OBJECT(shell),
                          "ok_callback");
   gpointer ok_data = gtk_object_get_data(GTK_OBJECT(shell),