[Freeciv-Dev] (PR#2887) win32 compiler warnings

["Jason Short via RT" <rt@xxxxxxxxxxxxxx>]

There are a large number of compiler warnings when compiling the win32
client.  Most of them look harmless.  This patch fixes almost all of
them (the remaining ones may be a bit harder).

jason

? client/diff1
? client/diff2
? client/diff3
? client/diff4
? client/diff5
? client/diff6
? client/diff7
? client/diff8
? client/gui-win32/diff1
? client/gui-win32/diff10
? client/gui-win32/diff11
? client/gui-win32/diff12
? client/gui-win32/diff13
? client/gui-win32/diff2
? client/gui-win32/diff3
? client/gui-win32/diff4
? client/gui-win32/diff5
? client/gui-win32/diff6
? client/gui-win32/diff7
? client/gui-win32/diff8
? client/gui-win32/diff9
Index: client/gui-win32/chatline.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/chatline.c,v
retrieving revision 1.8
diff -u -r1.8 chatline.c
--- client/gui-win32/chatline.c 2002/11/14 09:22:09     1.8
+++ client/gui-win32/chatline.c 2003/01/23 02:56:42
@@ -58,7 +58,7 @@
  A backup of the string (without the newline) is sent to the server
  Is there a nicer way to handle this?
 **************************************************************************/
-void handle_chatline()
+void handle_chatline(void)
 {
   static char msg_buf[MAX_LEN_MSG-MAX_LEN_USERNAME+1];
   char msg_buf2[MAX_LEN_MSG-MAX_LEN_USERNAME+1];
@@ -76,7 +76,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void append_output_window_real(char *astring)
+static void append_output_window_real(const char *astring)
 {
   int len;
   len=Edit_GetTextLength(logoutput_win);
@@ -92,7 +92,7 @@
      /* We need to add \r to lineends */ 
 {
 
-  char *str;
+  const char *str;
   char *str2;
   char buf[512];
   str=astring;
Index: client/gui-win32/chatline.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/chatline.h,v
retrieving revision 1.1
diff -u -r1.1 chatline.h
--- client/gui-win32/chatline.h 2001/09/04 19:09:32     1.1
+++ client/gui-win32/chatline.h 2003/01/23 02:56:42
@@ -15,6 +15,7 @@
 #define FC__CHATLINE_H
 
 #include "chatline_g.h"
-void handle_chatline();
-void append_output_winodw();
+
+void handle_chatline(void);
+
 #endif  /* FC__CHATLINE_H */
Index: client/gui-win32/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/citydlg.c,v
retrieving revision 1.46
diff -u -r1.46 citydlg.c
--- client/gui-win32/citydlg.c  2003/01/17 03:17:43     1.46
+++ client/gui-win32/citydlg.c  2003/01/23 02:56:43
@@ -461,7 +461,8 @@
 
 void city_dialog_update_building(struct city_dialog *pdialog)
 {
-  char buf2[100], buf[32], *descr;
+  char buf2[100], buf[32];
+  const char *descr;
   struct city *pcity=pdialog->pcity;    
   
   EnableWindow(pdialog->buy_but,!pcity->did_buy);
@@ -984,10 +985,10 @@
 **************************************************************************/
         
 
-void buy_callback(struct city_dialog *pdialog)
+static void buy_callback(struct city_dialog *pdialog)
 {
   int value;
-  char *name;
+  const char *name;
   char buf[512];    
    if(pdialog->pcity->is_building_unit) {
     name=get_unit_type(pdialog->pcity->currently_building)->name;
@@ -1045,7 +1046,7 @@
 /****************************************************************
 ...
 *****************************************************************/            
-void sell_callback(struct city_dialog *pdialog)
+static void sell_callback(struct city_dialog *pdialog)
 {
   char buf[100];
   if (pdialog->id_selected<0) {
@@ -1157,7 +1158,7 @@
 **************************************************************************/
 
      
-void change_callback(struct city_dialog *pdialog)
+static void change_callback(struct city_dialog *pdialog)
 {
   HWND dlg;
   
@@ -1318,7 +1319,7 @@
 /****************************************************************
 ...
 *****************************************************************/    
-void rename_callback(struct city_dialog *pdialog)
+static void rename_callback(struct city_dialog *pdialog)
 {
   input_dialog_create(pdialog->mainwindow,
                       /*"shellrenamecity"*/_("Rename City"),
@@ -1419,7 +1420,7 @@
 **************************************************************************/
 
 
-void activate_callback(struct city_dialog *pdialog)
+static void activate_callback(struct city_dialog *pdialog)
 {
   activate_all_units(pdialog->pcity->x, pdialog->pcity->y);
 }      
@@ -1427,7 +1428,7 @@
 /****************************************************************
 ...
 *****************************************************************/
-void show_units_callback(struct city_dialog *pdialog)
+static void show_units_callback(struct city_dialog *pdialog)
 {
   struct tile *ptile = map_get_tile(pdialog->pcity->x, pdialog->pcity->y);
  
@@ -1535,7 +1536,7 @@
 **************************************************************************/
 
 
-void unitupgrade_callback_yes(HWND w, void * data)
+static void unitupgrade_callback_yes(HWND w, void * data)
 {
   struct unit *punit;
  
@@ -1549,7 +1550,7 @@
 /****************************************************************
 ...
 *****************************************************************/
-void unitupgrade_callback_no(HWND w, void * data)
+static void unitupgrade_callback_no(HWND w, void * data)
 {
   destroy_message_dialog(w);
 }
@@ -1557,7 +1558,7 @@
 /****************************************************************
 ...
 *****************************************************************/       
-void upgrade_callback(HWND w, void * data)
+static void upgrade_callback(HWND w, void * data)
 {
   struct unit *punit;
   char buf[512];
@@ -1612,7 +1613,7 @@
 **************************************************************************/
 
 
-void city_dlg_click_supported(struct city_dialog *pdialog, int n)
+static void city_dlg_click_supported(struct city_dialog *pdialog, int n)
 {
   struct unit *punit;
   struct city *pcity;  
@@ -1639,7 +1640,7 @@
 **************************************************************************/
 
 
-void city_dlg_click_present(struct city_dialog *pdialog,int n)
+static void city_dlg_click_present(struct city_dialog *pdialog, int n)
 {
   struct unit *punit;
   struct city *pcity;
@@ -1690,7 +1691,7 @@
 **************************************************************************/
 
 
-void city_dlg_click_map(struct city_dialog *pdialog,int x,int y)
+static void city_dlg_click_map(struct city_dialog *pdialog, int x, int y)
 { 
   struct packet_city_request packet;    
   struct city *pcity;
@@ -1712,7 +1713,7 @@
 **************************************************************************/
 
 
-void city_dlg_click_citizens(struct city_dialog *pdialog,int n)
+static void city_dlg_click_citizens(struct city_dialog *pdialog, int n)
 {
   struct packet_city_request packet;
   if (pdialog->citizen_type[n]<0)
@@ -1879,11 +1880,8 @@
 **************************************************************************/
 
 
-LONG APIENTRY CitydlgWndProc (
-                           HWND hWnd,
-                           UINT message,
-                           UINT wParam,
-                           LONG lParam)
+static LONG APIENTRY CitydlgWndProc(HWND hWnd, UINT message,
+                                   UINT wParam, LONG lParam)
 {
   HBITMAP old;
   LPNMHDR nmhdr;
@@ -2074,7 +2072,7 @@
 **************************************************************************/
 
 
-void popdown_cityopt_dialog()
+static void popdown_cityopt_dialog(void)
 {
 }
 
Index: client/gui-win32/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/cityrep.c,v
retrieving revision 1.20
diff -u -r1.20 cityrep.c
--- client/gui-win32/cityrep.c  2003/01/11 02:49:10     1.20
+++ client/gui-win32/cityrep.c  2003/01/23 02:56:44
@@ -361,7 +361,7 @@
   for(i=0;i<selcount;i++)
     {
       int value;
-      char *name;
+      const char *name;
       char buf[512];            
       pcity=(struct city *)ListBox_GetItemData(GetDlgItem(hWnd,
                                                          ID_CITYREP_LIST),
@@ -388,11 +388,11 @@
     }
 }
   
-
+#if 0
 /**************************************************************************
 
 **************************************************************************/
-void cityrep_refresh(HWND hWnd)
+static void cityrep_refresh(HWND hWnd)
 {
     int cityids[256];
   int selcount;
@@ -419,6 +419,8 @@
                                  &packet);      
     }
 }
+#endif
+
 /**************************************************************************
 
 **************************************************************************/
@@ -617,7 +619,8 @@
 /**************************************************************************
 
 **************************************************************************/
-void list_impr_or_unit_select(HWND hLst,int num, TestCityFunc *test_func)
+static void list_impr_or_unit_select(HWND hLst, int num,
+                                    TestCityFunc *test_func)
 {
   int i,rows;
   list_all_select(hLst,FALSE);
Index: client/gui-win32/connectdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/connectdlg.c,v
retrieving revision 1.11
diff -u -r1.11 connectdlg.c
--- client/gui-win32/connectdlg.c       2002/11/14 09:14:59     1.11
+++ client/gui-win32/connectdlg.c       2003/01/23 02:56:44
@@ -174,7 +174,7 @@
 /*************************************************************************
   Exit without killing the server
 *************************************************************************/
-void quit_client_only()
+void quit_client_only(void)
 {
   CloseHandle(server_process);
   server_process=INVALID_HANDLE_VALUE;
@@ -184,7 +184,7 @@
 /*************************************************************************
  
 *************************************************************************/
-void show_server_window()
+void show_server_window(void)
 {
   ShowWindow(server_window,SW_SHOWNORMAL);
 }
@@ -764,7 +764,7 @@
 /**************************************************************************
 
 **************************************************************************/
-char getc_from_pipe()
+static char getc_from_pipe(void)
 {
   char tmp[2];
   DWORD rlen; 
@@ -786,7 +786,8 @@
 /**************************************************************************
 
 **************************************************************************/
-void get_line_from_pipe(char *buf, int bufsize) {
+static void get_line_from_pipe(char *buf, int bufsize)
+{
   int i;
   i=0;
   do {
@@ -802,7 +803,7 @@
 /**************************************************************************
 
 **************************************************************************/
-bool wait_for_prompt()
+static bool wait_for_prompt(void)
 {
   char tmp;
   do {
@@ -855,7 +856,7 @@
 /**************************************************************************
  Starts the server without arguments.
 **************************************************************************/
-void start_server_for_new_game()
+static void start_server_for_new_game(void)
 {
   char cmdline[512];
   server_port=min_free_port();
Index: client/gui-win32/connectdlg.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/connectdlg.h,v
retrieving revision 1.2
diff -u -r1.2 connectdlg.h
--- client/gui-win32/connectdlg.h       2002/03/09 20:11:19     1.2
+++ client/gui-win32/connectdlg.h       2003/01/23 02:56:44
@@ -16,8 +16,9 @@
 #define ID_SERVERBUTTON 2432
 #include "connectdlg_g.h"
 
-void quit_client_only();
-void show_server_window();
+void quit_client_only(void);
+void show_server_window(void);
 void handle_pipe_and_process(void);
 void handle_server_buttons(HWND button);
+
 #endif  /* FC__CONNECTDLG_H */
Index: client/gui-win32/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/dialogs.c,v
retrieving revision 1.27
diff -u -r1.27 dialogs.c
--- client/gui-win32/dialogs.c  2002/11/29 09:38:15     1.27
+++ client/gui-win32/dialogs.c  2003/01/23 02:56:45
@@ -576,7 +576,7 @@
 /**************************************************************************
 
 **************************************************************************/    
 
-void popdown_unit_select_dialog()
+static void popdown_unit_select_dialog(void)
 {
   if (unit_select_main)
     DestroyWindow(unit_select_main);
@@ -585,11 +585,8 @@
 /**************************************************************************
 
 **************************************************************************/
-LONG APIENTRY unitselect_proc (
-                           HWND hWnd,
-                           UINT message,
-                           UINT wParam,
-                           LONG lParam)
+static LONG APIENTRY unitselect_proc(HWND hWnd, UINT message,
+                                    UINT wParam, LONG lParam)
 {
   int id;
   int i;
@@ -1781,7 +1778,8 @@
 /**************************************************************************
 
 **************************************************************************/
-HWND popup_message_dialog(HWND parent,char *dialogname, char *text, ...)
+HWND popup_message_dialog(HWND parent, char *dialogname,
+                         const char *text, ...)
 {
   int idcount;
   va_list args;
Index: client/gui-win32/dialogs.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/dialogs.h,v
retrieving revision 1.1
diff -u -r1.1 dialogs.h
--- client/gui-win32/dialogs.h  2001/09/04 19:09:34     1.1
+++ client/gui-win32/dialogs.h  2003/01/23 02:56:45
@@ -14,7 +14,9 @@
 #define FC__DIALOGS_H
 
 #include "dialogs_g.h"
-HWND popup_message_dialog(HWND parent,char *dialogname, char *text, ...);
+
+HWND popup_message_dialog(HWND parent, char *dialogname,
+                         const char *text, ...);
 void destroy_message_dialog(HWND dlg);
 void message_dialog_button_set_sensitive(HWND dlg,int id,int state);
 BOOL unitselect_init(HINSTANCE hInstance);
Index: client/gui-win32/graphics.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/graphics.c,v
retrieving revision 1.12
diff -u -r1.12 graphics.c
--- client/gui-win32/graphics.c 2002/11/14 09:14:59     1.12
+++ client/gui-win32/graphics.c 2003/01/23 02:56:45
@@ -495,12 +495,14 @@
     draw_sprite_part(&fog_sprite,hdc,x,y,w,h,xsrc,ysrc);
 }
 
+#if 0
 /**************************************************************************
 
 **************************************************************************/
-void  crop_sprite_real(struct Sprite *source)
+static void crop_sprite_real(struct Sprite *source)
 {
 } 
+#endif
         
 /**************************************************************************
 
Index: client/gui-win32/gui_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/gui_main.c,v
retrieving revision 1.20
diff -u -r1.20 gui_main.c
--- client/gui-win32/gui_main.c 2003/01/01 11:51:34     1.20
+++ client/gui-win32/gui_main.c 2003/01/23 02:56:45
@@ -97,7 +97,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void HandleRMouse(int x, int y)
+static void HandleRMouse(int x, int y)
 {
   SetFocus(root_window);
 }
@@ -105,7 +105,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void HandleLMouse(int x, int y)
+static void HandleLMouse(int x, int y)
 {
   SetFocus(root_window);
   if ((x>overview_win_x)&&(x<overview_win_x+overview_win_width)
@@ -119,7 +119,7 @@
 /**************************************************************************
 
  **************************************************************************/
-void HandlePaint(HDC hdc)
+static void HandlePaint(HDC hdc)
 {
   overview_expose(hdc);
 }
@@ -127,17 +127,16 @@
 /**************************************************************************
 
 **************************************************************************/
-void do_mainwin_layout()
+void do_mainwin_layout(void)
 {
   fcwin_redo_layout(root_window);
  
 }
 
-
 /**************************************************************************
 
 **************************************************************************/
-void set_overview_win_dim(int w,int h)
+void set_overview_win_dim(int w, int h)
 {
   overview_win_width=w;
   overview_win_height=h;
@@ -145,7 +144,8 @@
   do_mainwin_layout();
   
 }
-void Handle_Hscroll(HWND hWnd,HWND hWndCtl,UINT code,int pos)
+
+static void Handle_Hscroll(HWND hWnd, HWND hWndCtl, UINT code, int pos)
 {
   int PosCur,PosMax,PosMin,id;
   PosCur=ScrollBar_GetPos(hWndCtl);
@@ -297,11 +297,8 @@
 /**************************************************************************
 
 **************************************************************************/
-LONG APIENTRY FreecivWndProc (
-                           HWND hWnd,
-                           UINT message,
-                           UINT wParam,
-                           LONG lParam)
+static LONG APIENTRY FreecivWndProc(HWND hWnd, UINT message,
+                                   UINT wParam, LONG lParam)
 {
   HDC hdc;
   PAINTSTRUCT ps;
@@ -360,7 +357,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void create_main_window()
+static void create_main_window(void)
 {
   HINSTANCE riched;
   struct fcwin_box *upper;
Index: client/gui-win32/gui_main.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/gui_main.h,v
retrieving revision 1.4
diff -u -r1.4 gui_main.h
--- client/gui-win32/gui_main.h 2002/11/27 08:45:59     1.4
+++ client/gui-win32/gui_main.h 2003/01/23 02:56:46
@@ -124,7 +124,7 @@
 extern int map_win_width;
 extern int map_win_height;
 extern HWND root_window;
-extern void do_mainwin_layout();
+extern void do_mainwin_layout(void);
 extern int overview_win_x;
 extern int overview_win_y;
 extern int overview_win_width;
@@ -142,5 +142,8 @@
 extern HWND map_scroll_h;
 extern HWND map_scroll_v;
 extern struct fcwin_box *output_box;
+
+void set_overview_win_dim(int w, int h);
+
 #endif  /* RC_INVOKED */
 #endif  /* FC__GUI_MAIN_H */
Index: client/gui-win32/gui_stuff.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/gui_stuff.c,v
retrieving revision 1.12
diff -u -r1.12 gui_stuff.c
--- client/gui-win32/gui_stuff.c        2002/11/14 09:14:59     1.12
+++ client/gui-win32/gui_stuff.c        2003/01/23 02:56:46
@@ -251,7 +251,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void init_layoutwindow()
+void init_layoutwindow(void)
 {
   WNDCLASS *wndclass;
   wndclass=fc_malloc(sizeof(WNDCLASS));
@@ -333,7 +333,7 @@
 /**************************************************************************
 
 **************************************************************************/
-struct fcwin_box * fcwin_box_new(int horiz, HWND owner, int same_size)
+static struct fcwin_box * fcwin_box_new(int horiz, HWND owner, int same_size)
 {
   struct fcwin_box *fcb;
   fcb=fc_malloc(sizeof(struct fcwin_box));
@@ -546,7 +546,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void button_minsize(LPPOINT minsize, void *data)
+static void button_minsize(LPPOINT minsize, void *data)
 {
   win_minsize(minsize,data);
   minsize->x=minsize->x+4;
@@ -987,7 +987,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void combo_setsize(LPRECT size,void *data)
+static void combo_setsize(LPRECT size, void *data)
 {
   struct list_data *ld=data;
   MoveWindow(ld->win,size->left,size->top,
Index: client/gui-win32/gui_stuff.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/gui_stuff.h,v
retrieving revision 1.6
diff -u -r1.6 gui_stuff.h
--- client/gui-win32/gui_stuff.h        2002/07/13 13:33:06     1.6
+++ client/gui-win32/gui_stuff.h        2003/01/23 02:56:46
@@ -23,7 +23,7 @@
 typedef void (*t_fcdelwidget)(void *);
 
 /* has to be called once */
-void init_layoutwindow();
+void init_layoutwindow(void);
 enum childwin_mode {
   REAL_CHILD,
   JUST_CLEANUP,
Index: client/gui-win32/mapctrl.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapctrl.c,v
retrieving revision 1.17
diff -u -r1.17 mapctrl.c
--- client/gui-win32/mapctrl.c  2003/01/05 15:34:06     1.17
+++ client/gui-win32/mapctrl.c  2003/01/23 02:56:46
@@ -335,7 +335,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void init_mapwindow()
+void init_mapwindow(void)
 {
   WNDCLASS *wndclass;
   wndclass=fc_malloc(sizeof(WNDCLASS));
@@ -436,7 +436,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void center_on_unit()
+void center_on_unit(void)
 {
    request_center_focus_unit(); 
 }
Index: client/gui-win32/mapctrl.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapctrl.h,v
retrieving revision 1.2
diff -u -r1.2 mapctrl.h
--- client/gui-win32/mapctrl.h  2001/12/13 17:02:47     1.2
+++ client/gui-win32/mapctrl.h  2003/01/23 02:56:46
@@ -17,9 +17,9 @@
 void map_handle_rbut(int x, int y);
 void map_handle_lbut(int x, int y);
 void map_handle_move(int window_x, int window_y);
-void center_on_unit();
-void init_mapwindow();
-void focus_to_next_unit();
+void center_on_unit(void);
+void init_mapwindow(void);
+void focus_to_next_unit(void);
 void overview_handle_rbut(int x, int y);
 void indicator_handle_but(int x);
 #endif  /* FC__MAPCTRL_H */
Index: client/gui-win32/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapview.c,v
retrieving revision 1.51
diff -u -r1.51 mapview.c
--- client/gui-win32/mapview.c  2003/01/17 20:20:56     1.51
+++ client/gui-win32/mapview.c  2003/01/23 02:56:47
@@ -31,7 +31,8 @@
 #include "support.h"
 #include "timing.h"
 #include "version.h"
- 
+
+#include "citydlg.h" 
 #include "civclient.h"
 #include "climap.h"
 #include "climisc.h"
@@ -67,7 +68,6 @@
 extern int seconds_to_turndone;   
 void update_map_canvas_scrollbars_size(void);
 void refresh_overview_viewrect_real(HDC hdcp);
-void set_overview_win_dim(int w,int h);
 void put_one_tile_full(HDC hdc, int x, int y,
                              int canvas_x, int canvas_y, int citymode);
 static void pixmap_put_tile_iso(HDC hdc, int x, int y,
Index: client/gui-win32/mapview.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapview.h,v
retrieving revision 1.4
diff -u -r1.4 mapview.h
--- client/gui-win32/mapview.h  2002/11/15 09:24:52     1.4
+++ client/gui-win32/mapview.h  2003/01/23 02:56:47
@@ -24,9 +24,9 @@
 void put_unit_city_overlays(struct unit *punit, HDC hdc, int x, int y);
 void put_one_tile_full(HDC hdc, int x, int y,
                       int canvas_x, int canvas_y, int citymode);
-void check_mapstore();
-void map_resize();
-void init_map_win();
+void check_mapstore(void);
+void map_resize(void);
+void init_map_win(void);
 void map_expose(HDC hdc);
 void overview_expose(HDC hdc);
 void map_handle_hscroll(int pos);
Index: client/gui-win32/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/menu.c,v
retrieving revision 1.13
diff -u -r1.13 menu.c
--- client/gui-win32/menu.c     2003/01/01 11:51:34     1.13
+++ client/gui-win32/menu.c     2003/01/23 02:56:47
@@ -204,7 +204,7 @@
 /**************************************************************************
 
 **************************************************************************/
-HACCEL my_create_menu_acceltable()
+HACCEL my_create_menu_acceltable(void)
 {
   return CreateAcceleratorTable(menuaccel,accelcount);
 }
@@ -435,7 +435,7 @@
 /**************************************************************************
 
 **************************************************************************/
-HMENU my_create_menu(struct my_menu **items)
+static HMENU my_create_menu(struct my_menu **items)
 {
   HMENU menu;
   if ((*items)->id==IDM_BEGIN) {
@@ -467,7 +467,7 @@
 /**************************************************************************
 
 **************************************************************************/
-void handle_numpad(int code)
+static void handle_numpad(int code)
 {
   if (is_isometric) {
     switch (code)
@@ -845,7 +845,7 @@
 /**************************************************************************
 
 **************************************************************************/
-HMENU create_mainmenu()
+HMENU create_mainmenu(void)
 {
   struct my_menu *items=main_menu;
   return my_create_menu(&items);
Index: client/gui-win32/menu.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/menu.h,v
retrieving revision 1.1
diff -u -r1.1 menu.h
--- client/gui-win32/menu.h     2001/09/04 19:09:37     1.1
+++ client/gui-win32/menu.h     2003/01/23 02:56:47
@@ -14,7 +14,9 @@
 #define FC__MENU_H
 
 #include "menu_g.h"
-HMENU create_mainmenu();
+
+HMENU create_mainmenu(void);
 void handle_menu(int code);
-HACCEL my_create_menu_acceltable();
+HACCEL my_create_menu_acceltable(void);
+
 #endif  /* FC__MENU_H */
Index: client/gui-win32/messagewin.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/messagewin.c,v
retrieving revision 1.9
diff -u -r1.9 messagewin.c
--- client/gui-win32/messagewin.c       2002/11/27 09:06:14     1.9
+++ client/gui-win32/messagewin.c       2003/01/23 02:56:48
@@ -53,10 +53,10 @@
 /**************************************************************************
 
 **************************************************************************/
-LONG APIENTRY MsgdlgProc(HWND hWnd,
-                        UINT message,
-                        UINT wParam,
-                        LONG lParam)
+static LONG APIENTRY MsgdlgProc(HWND hWnd,
+                               UINT message,
+                               UINT wParam,
+                               LONG lParam)
 {
   switch(message)
     {
Index: client/gui-win32/optiondlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/optiondlg.c,v
retrieving revision 1.12
diff -u -r1.12 optiondlg.c
--- client/gui-win32/optiondlg.c        2002/12/22 13:08:57     1.12
+++ client/gui-win32/optiondlg.c        2003/01/23 02:56:48
@@ -22,9 +22,11 @@
 #include "fcintl.h"
 #include "game.h"
 #include "support.h"
+#include "options.h"
+
 #include "gui_stuff.h"
 #include "gui_main.h"
-#include "options.h"
+#include "optiondlg.h"
 
 static HWND option_dialog;
 
Index: client/gui-win32/plrdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/plrdlg.c,v
retrieving revision 1.11
diff -u -r1.11 plrdlg.c
--- client/gui-win32/plrdlg.c   2003/01/05 20:51:37     1.11
+++ client/gui-win32/plrdlg.c   2003/01/23 02:56:48
@@ -62,7 +62,7 @@
 /******************************************************************
 
 *******************************************************************/
-void players_meet(int player_index)
+static void players_meet(int player_index)
 {
   if (player_has_embassy(game.player_ptr,&game.players[player_index])) {
     struct packet_diplomacy_info pa;
@@ -81,7 +81,7 @@
 /******************************************************************
 
 *******************************************************************/
-void players_war(int player_index)
+static void players_war(int player_index)
 {
   struct packet_generic_integer pa;  
   pa.value = player_index;
@@ -92,7 +92,7 @@
 /******************************************************************
 
 *******************************************************************/
-void players_vision(int player_index)
+static void players_vision(int player_index)
 {
   struct packet_generic_integer pa;  
   pa.value = player_index;
@@ -103,7 +103,7 @@
 /******************************************************************
 
 *******************************************************************/
-void players_intel(int player_index)
+static void players_intel(int player_index)
 {
   if(player_has_embassy(game.player_ptr, &game.players[player_index]))
     popup_intel_dialog(&game.players[player_index]);
@@ -113,7 +113,7 @@
 /******************************************************************
 
 *******************************************************************/
-void players_sship(int player_index)
+static void players_sship(int player_index)
 {
   popup_spaceship_dialog(&game.players[player_index]);
 }
@@ -201,7 +201,8 @@
 /******************************************************************
 
 *******************************************************************/
-int CALLBACK sort_proc(LPARAM lParam1,LPARAM lParam2,LPARAM lParamSort)
+static int CALLBACK sort_proc(LPARAM lParam1, LPARAM lParam2,
+                             LPARAM lParamSort)
 {
   char text1[128];
   char text2[128];
@@ -340,7 +341,7 @@
 /******************************************************************
 
 *******************************************************************/
-void create_players_dialog()
+static void create_players_dialog(void)
 {
   int i;
   static char *titles_[NUM_COLUMNS] =