Complete.Org: Mailing Lists: Archives: freeciv-dev: March 2004:
[Freeciv-Dev] (PR#7614) win32-client warnings
Home

[Freeciv-Dev] (PR#7614) win32-client warnings

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] (PR#7614) win32-client warnings
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Fri, 5 Mar 2004 21:05:35 -0800
Reply-to: rt@xxxxxxxxxxx

<URL: http://rt.freeciv.org/Ticket/Display.html?id=7614 >

This patch fixes the compile-time warnings in gui-win32.

jason

Index: client/gui-win32/connectdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/connectdlg.c,v
retrieving revision 1.16
diff -u -r1.16 connectdlg.c
--- client/gui-win32/connectdlg.c       6 Dec 2003 23:14:34 -0000       1.16
+++ client/gui-win32/connectdlg.c       6 Mar 2004 05:01:04 -0000
@@ -49,6 +49,7 @@
 #include "menu.h"
 #include "optiondlg.h"
 #include "options.h"
+#include "packhand_gen.h"
 #include "spaceshipdlg.h"
 #include "tilespec.h"
 
Index: client/gui-win32/diplodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/diplodlg.c,v
retrieving revision 1.15
diff -u -r1.15 diplodlg.c
--- client/gui-win32/diplodlg.c 6 Dec 2003 23:14:34 -0000       1.15
+++ client/gui-win32/diplodlg.c 6 Mar 2004 05:01:04 -0000
@@ -355,8 +355,11 @@
 static void handle_advances_menu(struct Diplomacy_dialog *pdialog,int choice)
 {
   int plrno0 = choice / 10000;
+#if 0 /* Unneeded. */
   int plrno1 = (choice / 100) % 100;
+#endif
   int value = choice % 100;
+
   dsend_packet_diplomacy_create_clause_req(&aconnection, 
                                           pdialog->treaty.plr1->player_no,
                                           plrno0, CLAUSE_ADVANCE, value);
Index: client/gui-win32/mapctrl.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapctrl.c,v
retrieving revision 1.33
diff -u -r1.33 mapctrl.c
--- client/gui-win32/mapctrl.c  4 Jan 2004 00:42:24 -0000       1.33
+++ client/gui-win32/mapctrl.c  6 Mar 2004 05:01:04 -0000
@@ -333,7 +333,9 @@
   int delta = 10;
   int lux_end = game.player_ptr->economic.luxury;
   int sci_end = lux_end + game.player_ptr->economic.science;
+#if 0 /* Unneeded. */
   int tax_end = 100; 
+#endif
   int luxury = game.player_ptr->economic.luxury;
   int science = game.player_ptr->economic.science;
   int tax = game.player_ptr->economic.tax;
Index: client/gui-win32/plrdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/plrdlg.c,v
retrieving revision 1.18
diff -u -r1.18 plrdlg.c
--- client/gui-win32/plrdlg.c   6 Dec 2003 23:14:34 -0000       1.18
+++ client/gui-win32/plrdlg.c   6 Mar 2004 05:01:04 -0000
@@ -403,7 +403,7 @@
     ListView_DeleteAllItems(lv);
     for (i = 0; i < game.nplayers; i++) {
       build_row(row_texts, i, 0);
-      row=fcwin_listview_add_row(lv,i,NUM_COLUMNS,row_texts);
+      row=fcwin_listview_add_row(lv,i,NUM_COLUMNS, (char **)row_texts);
       lvi.iItem=row;
       lvi.iSubItem=0;
       lvi.lParam=i;

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#7614) win32-client warnings, Jason Short <=