Complete.Org: Mailing Lists: Archives: freeciv-dev: September 2004:
[Freeciv-Dev] (PR#10137) fix warnings in gui-win32
Home

[Freeciv-Dev] (PR#10137) fix warnings in gui-win32

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] (PR#10137) fix warnings in gui-win32
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 15 Sep 2004 19:58:12 -0700
Reply-to: rt@xxxxxxxxxxx

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

This patch fixes some compiler warnings in gui-win32.

The mapview function simply isn't used anymore.  The repodlgs changes 
are needed because when compiling without NLS you otherwise end up 
passing the const char as a non-const.

jason

? client/tilespec.diff
Index: client/gui-win32/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapview.c,v
retrieving revision 1.131
diff -u -r1.131 mapview.c
--- client/gui-win32/mapview.c  26 Jul 2004 08:11:56 -0000      1.131
+++ client/gui-win32/mapview.c  16 Sep 2004 02:55:28 -0000
@@ -710,19 +710,6 @@
 /**************************************************************************
 Only used for isometric view.
 **************************************************************************/
-static void pixmap_put_black_tile_iso(HDC hdc,
-                                      int canvas_x, int canvas_y,
-                                      int offset_x, int offset_y,
-                                      int width, int height)
-{
-  draw_sprite_part(sprites.black_tile,hdc,canvas_x+offset_x,canvas_y+offset_y,
-                  width,height,
-                  offset_x,offset_x);
-}
-
-/**************************************************************************
-Only used for isometric view.
-**************************************************************************/
 static void pixmap_put_overlay_tile_draw(HDC hdc,
                                          int canvas_x, int canvas_y,
                                          struct Sprite *ssprite,
Index: client/gui-win32/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/repodlgs.c,v
retrieving revision 1.39
diff -u -r1.39 repodlgs.c
--- client/gui-win32/repodlgs.c 28 Aug 2004 00:54:05 -0000      1.39
+++ client/gui-win32/repodlgs.c 16 Sep 2004 02:55:29 -0000
@@ -636,9 +636,9 @@
     {
       HWND lv;
       LV_COLUMN lvc;
-      const char *headers[]={N_("Unit Type"),N_("U"),
-                            N_("In-Prog"),N_("Active"),
-                            N_("Shield"),N_("Food"),NULL};
+      char *headers[] = {N_("Unit Type"), N_("U"),
+                        N_("In-Prog"), N_("Active"),
+                        N_("Shield"), N_("Food"), NULL};
       int i;
       struct fcwin_box *vbox;
       struct fcwin_box *hbox;

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