[Freeciv-Dev] (PR#3412) Intel compiler warnings for gui-sdl

["Raimar Falke" <rf13@xxxxxxxxxxxxxxxxx>]

No further comment.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
  Tank: So what do you need? Besides a miracle.
  Neo: Guns. Lots of guns.
    -- From The Matrix

Index: client/gui-sdl/chatline.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/chatline.c,v
retrieving revision 1.4
diff -u -u -r1.4 chatline.c
--- client/gui-sdl/chatline.c   2003/02/02 20:49:19     1.4
+++ client/gui-sdl/chatline.c   2003/02/13 11:22:58
@@ -617,7 +617,7 @@
 **************************************************************************/
 void set_output_window_unitext(Uint16 * pUnistring)
 {
-  return add_to_log_list(create_string16(pUnistring, PTSIZE_LOG_FONT));
+  add_to_log_list(create_string16(pUnistring, PTSIZE_LOG_FONT));
 }
 
 /**************************************************************************
Index: client/gui-sdl/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/dialogs.c,v
retrieving revision 1.10
diff -u -u -r1.10 dialogs.c
--- client/gui-sdl/dialogs.c    2003/02/02 20:49:19     1.10
+++ client/gui-sdl/dialogs.c    2003/02/13 11:23:07
@@ -958,9 +958,8 @@
   pCity = pTile->city;
   n = unit_list_size(&pTile->units);
   
-  if ( !n && !pCity )
-  {
-    return popup_terrain_info_dialog( pTile , x , y);
+  if (!n && !pCity) {
+    popup_terrain_info_dialog(pTile, x, y);
   }
   
   h = WINDOW_TILE_HIGH + 3 + FRAME_WH;
Index: client/gui-sdl/graphics.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/graphics.c,v
retrieving revision 1.10
diff -u -u -r1.10 graphics.c
--- client/gui-sdl/graphics.c   2003/01/30 19:09:26     1.10
+++ client/gui-sdl/graphics.c   2003/02/13 11:23:10
@@ -348,13 +348,6 @@
 
   if (!lng) return;
   
-  if (lng < 0) {
-    int tmp = y0;
-    y0 = y1;
-    y1 = tmp;
-    lng *= -1;
-  }
-
   buf_ptr = ((Uint8 *) pDest->pixels + (y0 * pitch));
   max = buf_ptr + (lng * pitch);
 
@@ -426,10 +419,6 @@
   
   if (!lng) return;
   
-  if (lng < 0) {
-    lng *= -1;
-  }
-
   buf_ptr = ((Uint8 *) pDest->pixels + (y * pDest->pitch));
   
   switch (pDest->format->BytesPerPixel) {
@@ -1364,10 +1353,8 @@
 void refresh_screen(Sint16 x, Sint16 y, Uint16 w, Uint16 h)
 {
   SDL_Rect dest = { x, y, w, h };
-  if ( !x && !y &&
-    (!w || w == Main.screen->w ) && ( !h || h == Main.screen->h ))
-  {  
-    return refresh_fullscreen();
+  if (!x && !y && (!w || w == Main.screen->w) && (!h || h == Main.screen->h)) {
+    refresh_fullscreen();
   }
   if (correct_rect_region(&dest))
     SDL_UpdateRect(Main.screen, dest.x, dest.y, dest.w, dest.h);
Index: client/gui-sdl/graphics.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/graphics.h,v
retrieving revision 1.5
diff -u -u -r1.5 graphics.h
--- client/gui-sdl/graphics.h   2003/01/30 19:09:26     1.5
+++ client/gui-sdl/graphics.h   2003/02/13 11:23:10
@@ -30,7 +30,7 @@
 #define        RECT_LIMIT      80
 
 struct Sprite {
-  struct SDL_Surface;
+  struct SDL_Surface hiho;
 };
 
 #define GET_SURF(s)    fc__extension((SDL_Surface *)s)
@@ -72,12 +72,12 @@
 
 /* Rect */
 void refresh_screen(Sint16 x, Sint16 y, Uint16 w, Uint16 h);
-extern __inline__ void refresh_rect(SDL_Rect Rect);
-extern __inline__ void refresh_fullscreen(void);
+void refresh_rect(SDL_Rect Rect);
+void refresh_fullscreen(void);
 
 void refresh_rects(void);
-extern __inline__ void add_refresh_region(Sint16 x, Sint16 y, Uint16 w, Uint16 
h);
-extern __inline__ void add_refresh_rect(SDL_Rect Rect);
+void add_refresh_region(Sint16 x, Sint16 y, Uint16 w, Uint16 h);
+void add_refresh_rect(SDL_Rect Rect);
 int correct_rect_region(SDL_Rect *pRect);
 int detect_rect_colisions(SDL_Rect *pMaster, SDL_Rect *pSlave);
 int cmp_rect(SDL_Rect *pMaster, SDL_Rect *pSlave);
Index: client/gui-sdl/gui_stuff.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/gui_stuff.c,v
retrieving revision 1.7
diff -u -u -r1.7 gui_stuff.c
--- client/gui-sdl/gui_stuff.c  2003/02/02 20:49:19     1.7
+++ client/gui-sdl/gui_stuff.c  2003/02/13 11:23:18
@@ -894,7 +894,7 @@
 **************************************************************************/
 void del_main_list(void)
 {
-  return del_gui_list(pBeginWidgetList);
+  del_gui_list(pBeginWidgetList);
 }
 
 /**************************************************************************
@@ -2690,7 +2690,7 @@
          /* convert and add to chain */
          /* ugly fix */
          chr = (Uint8) (Main.event.key.keysym.unicode);
-         pUniChar = convert_to_utf16(&chr);
+         pUniChar = convert_to_utf16((const char *)&chr);
          pInputChain->prev->chr = *pUniChar;
          FREE(pUniChar);