Index: src/actions.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/actions.c,v
retrieving revision 1.273
diff -u -p -r1.273 actions.c
--- src/actions.c	15 May 2006 23:46:27 -0000	1.273
+++ src/actions.c	18 May 2006 18:37:55 -0000
@@ -92,8 +92,8 @@ add_set_var (char *name, cmdret * (*fn)(
   list_add (&var->node, &set_vars);
 }
 
-void
-init_set_vars()
+static void
+init_set_vars(void)
 {
   add_set_var ("resizeunit", set_resizeunit, 1, "", arg_NUMBER);
   add_set_var ("maxundos", set_maxundos, 1, "", arg_NUMBER);
@@ -365,7 +365,7 @@ static char* fdump (rp_screen *screen);
 
 /* Delete all entries in the redo list. */
 static void
-clear_frame_redos ()
+clear_frame_redos (void)
 {
   rp_frame_undo *cur;
   struct list_head *tmp, *iter;
@@ -428,14 +428,14 @@ pop_frame_list (struct list_head *undo_l
 
 /* Pop the head of the frame undo list off and put it in the redo list. */
 static rp_frame_undo *
-pop_frame_undo ()
+pop_frame_undo (void)
 {
   return pop_frame_list (&rp_frame_undos, &rp_frame_redos);
 }
 
 /* Pop the head of the frame redo list off and put it in the undo list. */
 static rp_frame_undo *
-pop_frame_redo ()
+pop_frame_redo (void)
 {
   return pop_frame_list (&rp_frame_redos, &rp_frame_undos);
 }
@@ -566,7 +566,7 @@ remove_keybinding (KeySym keysym, unsign
   return 0;
 }
 
-rp_keymap *
+static rp_keymap *
 keymap_new (char *name)
 {
   rp_keymap *map;
@@ -833,7 +833,7 @@ static int string_to_keysym (char *str)
 }
 
 /* Parse a key description. 's' is, naturally, the key description. */
-cmdret *
+static cmdret *
 parse_keydesc (char *s, struct rp_key *key)
 {
   char *token, *next_token, *keydesc;
@@ -1183,7 +1183,7 @@ string_to_window_number (char *str)
   return *s ? -1 : i;
 }
 
-struct list_head *
+static struct list_head *
 trivial_completions (char* str)
 {
   struct list_head *list;
@@ -1195,7 +1195,7 @@ trivial_completions (char* str)
   return list;
 }
 
-struct list_head *
+static struct list_head *
 keymap_completions (char* str)
 {
   rp_keymap *cur;
@@ -1217,7 +1217,7 @@ keymap_completions (char* str)
   return list;
 }
 
-struct list_head *
+static struct list_head *
 window_completions (char* str)
 {
   rp_window_elem *cur;
@@ -1467,7 +1467,7 @@ read_keydesc (struct argspec *spec, stru
   return cmdret_new (RET_SUCCESS, NULL);
 }
 
-struct list_head *
+static struct list_head *
 group_completions (char *str)
 {
   struct list_head *list;
@@ -1500,7 +1500,7 @@ group_completions (char *str)
   return list;
 }
 
-struct list_head *
+static struct list_head *
 colon_completions (char* str)
 {
   int i;
@@ -1543,7 +1543,7 @@ read_command (struct argspec *spec, stru
   return read_string (spec, s, colon_completions, arg);
 }
 
-struct list_head *
+static struct list_head *
 exec_completions (char *str)
 {
   size_t n = 256;
@@ -1885,7 +1885,7 @@ read_group (struct argspec *spec, struct
   return cmdret_new (RET_SUCCESS, NULL);
 }
 
-struct list_head *
+static struct list_head *
 hook_completions (char* str)
 {
   struct list_head *list;
@@ -1953,7 +1953,7 @@ find_variable (char *str)
   return NULL;
 }
 
-struct list_head *
+static struct list_head *
 var_completions (char *str)
 {
   struct list_head *list;
@@ -3431,7 +3431,7 @@ update_gc (rp_screen *s)
 }
 
 static void
-update_all_gcs ()
+update_all_gcs (void)
 {
   int i;
 
@@ -4731,7 +4731,7 @@ cmd_gdelete (int interactive, struct cmd
 }
 
 static void
-grab_rat ()
+grab_rat (void)
 {
   XGrabPointer (dpy, current_screen()->root, True, 0,
                 GrabModeAsync, GrabModeAsync,
@@ -4739,7 +4739,7 @@ grab_rat ()
 }
 
 static void
-ungrab_rat ()
+ungrab_rat (void)
 {
   XUngrabPointer (dpy, CurrentTime);
 }
Index: src/actions.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/actions.h,v
retrieving revision 1.88
diff -u -p -r1.88 actions.h
--- src/actions.h	21 Apr 2006 00:14:26 -0000	1.88
+++ src/actions.h	18 May 2006 18:37:55 -0000
@@ -210,12 +210,12 @@ RP_CMD (getsel);
 void del_frame_undo (rp_frame_undo *u);
 
 rp_keymap *find_keymap (char *name);
-void init_user_commands();
+void init_user_commands(void);
 void initialize_default_keybindings (void);
 void cmdret_free (cmdret *ret);
 void keymap_free (rp_keymap *map);
-void free_aliases ();
-void free_keymaps ();
+void free_aliases (void);
+void free_keymaps (void);
 char *wingravity_to_string (int g);
 rp_action* find_keybinding (KeySym keysym, unsigned int state, rp_keymap *map);
 rp_action* find_keybinding_by_action (char *action, rp_keymap *map);
Index: src/bar.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/bar.c,v
retrieving revision 1.56
diff -u -p -r1.56 bar.c
--- src/bar.c	29 Apr 2006 15:34:15 -0000	1.56
+++ src/bar.c	18 May 2006 18:37:55 -0000
@@ -46,7 +46,7 @@ static int last_mark_end = 0;
 
 /* Reset the alarm to auto-hide the bar in BAR_TIMEOUT seconds. */
 static void
-reset_alarm ()
+reset_alarm (void)
 {
   alarm (defaults.bar_timeout);
   alarm_signalled = 0;
Index: src/bar.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/bar.h,v
retrieving revision 1.19
diff -u -p -r1.19 bar.h
--- src/bar.h	15 Mar 2006 07:10:40 -0000	1.19
+++ src/bar.h	18 May 2006 18:37:55 -0000
@@ -32,7 +32,7 @@ int bar_x (rp_screen *s, int width);
 void message (char *s);
 void marked_message (char *s, int mark_start, int mark_end);
 void marked_message_printf (int mark_start, int mark_end, char *fmt, ...);
-void show_last_message ();
-void free_bar ();
+void show_last_message (void);
+void free_bar (void);
 
 #endif /* ! _RATPOISON_BAR_H */
Index: src/events.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/events.c,v
retrieving revision 1.133
diff -u -p -r1.133 events.c
--- src/events.c	15 May 2006 23:46:27 -0000	1.133
+++ src/events.c	18 May 2006 18:37:55 -0000
@@ -780,7 +780,7 @@ selection_request (XSelectionRequestEven
 }
 
 static void
-selection_clear ()
+selection_clear (void)
 {
   if (selection.text)
     free (selection.text);
@@ -884,7 +884,7 @@ delegate_event (XEvent *ev)
 }
 
 static void
-handle_signals ()
+handle_signals (void)
 {
   /* An alarm means we need to hide the popup windows. */
   if (alarm_signalled > 0)
Index: src/events.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/events.h,v
retrieving revision 1.11
diff -u -p -r1.11 events.h
--- src/events.h	4 Apr 2006 01:16:35 -0000	1.11
+++ src/events.h	18 May 2006 18:37:55 -0000
@@ -22,7 +22,7 @@
 #ifndef _RATPOISON_EVENTS_H
 #define _RATPOISON_EVENTS_H 1
 
-void listen_for_events ();
+void listen_for_events (void);
 void show_rudeness_msg (rp_window *win, int raised);
 
 #endif /* _RATPOISON_EVENTS_H */
Index: src/globals.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/globals.c,v
retrieving revision 1.19
diff -u -p -r1.19 globals.c
--- src/globals.c	20 Apr 2006 02:10:02 -0000	1.19
+++ src/globals.c	18 May 2006 18:37:55 -0000
@@ -84,7 +84,7 @@ struct numset *rp_frame_numset;
 rp_xselection selection;
 
 static void
-x_export_selection ()
+x_export_selection (void)
 {
   /* Hang the selections off screen 0's key window. */
   XSetSelectionOwner(dpy, XA_PRIMARY, screens[0].key_window, CurrentTime);
@@ -126,7 +126,7 @@ set_selection (char *txt)
 }
 
 static char *
-get_cut_buffer ()
+get_cut_buffer (void)
 {
   int nbytes;
   char *data;
@@ -148,7 +148,7 @@ get_cut_buffer ()
 
 /* Lifted the code from rxvt. */
 static char *
-get_primary_selection()
+get_primary_selection(void)
 {
   long            nread;
   unsigned long   bytes_after;
Index: src/globals.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/globals.h,v
retrieving revision 1.24
diff -u -p -r1.24 globals.h
--- src/globals.h	20 Apr 2006 02:10:02 -0000	1.24
+++ src/globals.h	18 May 2006 18:37:55 -0000
@@ -171,8 +171,8 @@ extern struct list_head rp_frame_redos;
 extern rp_xselection selection;
 void set_selection (char *txt);
 void set_nselection (char *txt, int len);
-char *get_selection ();
+char *get_selection (void);
 
-void init_globals ();
+void init_globals (void);
 
 #endif
Index: src/group.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/group.c,v
retrieving revision 1.17
diff -u -p -r1.17 group.c
--- src/group.c	16 Mar 2006 00:33:35 -0000	1.17
+++ src/group.c	18 May 2006 18:37:55 -0000
@@ -216,7 +216,7 @@ group_insert_window (struct list_head *h
   list_add_tail(&w->node, h);
 }
 
-int
+static int
 group_in_list (struct list_head *h, rp_window_elem *w)
 {
   rp_window_elem *cur;
Index: src/group.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/group.h,v
retrieving revision 1.12
diff -u -p -r1.12 group.h
--- src/group.h	20 Oct 2005 06:21:44 -0000	1.12
+++ src/group.h	18 May 2006 18:37:55 -0000
@@ -21,8 +21,8 @@
 #ifndef GROUP_H
 #define GROUP_H
 
-void init_groups ();
-void free_groups();
+void init_groups (void);
+void free_groups (void);
 
 void group_add_window (rp_group *g, rp_window *w);
 void group_resort_window (rp_group *g, rp_window_elem *w);
@@ -48,8 +48,8 @@ rp_group *groups_find_group_by_group (rp
 
 rp_window *group_last_window (rp_group *g, rp_screen *screen);
 
-rp_group *group_prev_group ();
-rp_group *group_next_group ();
+rp_group *group_prev_group (void);
+rp_group *group_next_group (void);
 
 rp_group *group_add_new_group (char *name);
 
Index: src/history.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/history.c,v
retrieving revision 1.7
diff -u -p -r1.7 history.c
--- src/history.c	16 Mar 2006 00:33:35 -0000	1.7
+++ src/history.c	18 May 2006 18:37:55 -0000
@@ -29,7 +29,7 @@
 #include "readline/history.h"
 
 static char *
-get_history_filename ()
+get_history_filename (void)
 {
   char *homedir = getenv ("HOME");
   char *filename;
Index: src/history.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/history.h,v
retrieving revision 1.3
diff -u -p -r1.3 history.h
--- src/history.h	4 Dec 2004 03:33:24 -0000	1.3
+++ src/history.h	18 May 2006 18:37:55 -0000
@@ -21,14 +21,14 @@
 #ifndef _RATPOISON_HISTORY_H
 #define _RATPOISON_HISTORY_H 1
 
-void  history_load ();
-void  history_save ();
+void  history_load (void);
+void  history_save (void);
 void  history_resize (int size);
-void  history_reset ();
+void  history_reset (void);
 void  history_add (char *item);
-char *history_next ();
-char *history_previous ();
-char *history_list_items ();
+char *history_next (void);
+char *history_previous (void);
+char *history_list_items (void);
 int   history_expand_line (char *string, char **output);
 
 #endif /* ! _RATPOISON_HISTORY_H */
Index: src/input.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/input.h,v
retrieving revision 1.19
diff -u -p -r1.19 input.h
--- src/input.h	4 Dec 2004 03:33:24 -0000	1.19
+++ src/input.h	18 May 2006 18:37:55 -0000
@@ -29,9 +29,9 @@ char *get_more_input (char *prompt, char
 int read_key (KeySym *keysym, unsigned int *modifiers, char *keysym_name, int len);
 unsigned int x11_mask_to_rp_mask (unsigned int mask);
 unsigned int rp_mask_to_x11_mask (unsigned int mask);
-void update_modifier_map ();
+void update_modifier_map (void);
 void grab_key (KeySym keysym, unsigned int modifiers, Window grab_window);
 
-void ring_bell ();
+void ring_bell (void);
 
 #endif /* ! _RATPOISON_INPUT_H */
Index: src/main.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/main.c,v
retrieving revision 1.126
diff -u -p -r1.126 main.c
--- src/main.c	15 May 2006 23:46:27 -0000	1.126
+++ src/main.c	18 May 2006 18:37:55 -0000
@@ -163,19 +163,19 @@ str_comp (char *s1, char *s2, int len)
   return 1;
 }
 
-void
+static void
 sighandler (int signum)
 {
   kill_signalled++;
 }
 
-void
+static void
 hup_handler (int signum)
 {
   hup_signalled++;
 }
 
-void
+static void
 alrm_handler (int signum)
 {
   alarm_signalled++;
@@ -221,7 +221,7 @@ chld_handler (int signum)
   errno = serrno;
 }
 
-int
+static int
 handler (Display *d, XErrorEvent *e)
 {
   char error_msg[100];
@@ -280,8 +280,8 @@ set_sig_handler (int sig, void (*action)
     }
 }
 
-void
-print_version ()
+static void
+print_version (void)
 {
   printf ("%s %s (built %s %s)\n", PACKAGE, VERSION, __DATE__, __TIME__);
   printf ("Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Shawn Betts\n\n");
@@ -289,8 +289,8 @@ print_version ()
   exit (EXIT_SUCCESS);
 }
 
-void
-print_help ()
+static void
+print_help (void)
 {
   printf ("Help for %s %s\n\n", PACKAGE, VERSION);
   printf ("-h, --help            Display this help screen\n");
@@ -425,7 +425,7 @@ read_startup_files (char *alt_rcfile)
 /* Odd that we spend so much code on making sure the silly welcome
    message is correct. Oh well... */
 static void
-show_welcome_message ()
+show_welcome_message (void)
 {
   rp_action *help_action;
   char *prefix, *help;
@@ -463,7 +463,7 @@ show_welcome_message ()
 }
 
 static void
-init_defaults ()
+init_defaults (void)
 {
   defaults.top_kmap = xstrdup(TOP_KEYMAP);
 
Index: src/manage.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/manage.h,v
retrieving revision 1.24
diff -u -p -r1.24 manage.h
--- src/manage.h	16 Mar 2006 00:33:35 -0000	1.24
+++ src/manage.h	18 May 2006 18:37:55 -0000
@@ -24,16 +24,16 @@
 
 #include "data.h"
 
-void clear_unmanaged_list ();
-char *list_unmanaged_windows ();
+void clear_unmanaged_list (void);
+char *list_unmanaged_windows (void);
 void add_unmanaged_window (char *name);
 int unmanaged_window (Window w);
-rp_screen* current_screen ();
+rp_screen* current_screen (void);
 void scanwins(rp_screen *s);
 void unmanage (rp_window *w);
 int update_window_name (rp_window *win);
 void update_normal_hints (rp_window *win);
-void rename_current_window ();
+void rename_current_window (void);
 void send_configure (Window w, int x, int y, int width, int height, int border);
 void set_state (rp_window *win, int state);
 long get_state (rp_window *win);
@@ -47,12 +47,12 @@ void force_maximize (rp_window *win);
 
 void grab_top_level_keys (Window w);
 void ungrab_top_level_keys (Window w);
-void ungrab_keys_all_wins ();
-void grab_keys_all_wins ();
+void ungrab_keys_all_wins (void);
+void grab_keys_all_wins (void);
 
 void hide_window (rp_window *win);
 void unhide_window (rp_window *win);
-void unhide_all_windows ();
+void unhide_all_windows (void);
 void unhide_window_below (rp_window *win);
 void withdraw_window (rp_window *win);
 void hide_others (rp_window *win);
Index: src/number.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/number.h,v
retrieving revision 1.11
diff -u -p -r1.11 number.h
--- src/number.h	16 Mar 2006 00:33:35 -0000	1.11
+++ src/number.h	18 May 2006 18:37:55 -0000
@@ -36,7 +36,7 @@ struct numset
   int max_taken;
 };
 
-struct numset *numset_new ();
+struct numset *numset_new (void);
 void numset_free (struct numset *ns);
 void numset_release (struct numset *ns, int n);
 int numset_request (struct numset *ns);
Index: src/ratpoison.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/ratpoison.h,v
retrieving revision 1.35
diff -u -p -r1.35 ratpoison.h
--- src/ratpoison.h	20 Apr 2006 02:10:02 -0000	1.35
+++ src/ratpoison.h	18 May 2006 18:37:55 -0000
@@ -90,7 +90,7 @@ extern XGCValues gv;
 #include "xinerama.h"
 #include "format.h"
 
-void clean_up ();
+void clean_up (void);
 rp_screen *find_screen (Window w);
 
 void set_close_on_exec (FILE *fd);
@@ -104,7 +104,7 @@ char *xsprintf (char *fmt, ...);
 char *xvsprintf (char *fmt, va_list ap);
 int str_comp (char *s1, char *s2, int len);
 /* Needed in cmd_tmpwm */
-void check_child_procs ();
+void check_child_procs (void);
 void chld_handler (int signum);
 void set_sig_handler (int sig, void (*action)(int));
 /* Font functions. */
Index: src/split.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/split.h,v
retrieving revision 1.22
diff -u -p -r1.22 split.h
--- src/split.h	4 Dec 2004 03:33:24 -0000	1.22
+++ src/split.h	18 May 2006 18:37:55 -0000
@@ -28,7 +28,7 @@ void cleanup_frame (rp_frame *frame);
 void maximize_all_windows_in_frame (rp_frame *frame);
 void h_split_frame (rp_frame *frame, int pixels);
 void v_split_frame (rp_frame *frame, int pixels);
-void remove_all_splits ();
+void remove_all_splits (void);
 void resize_shrink_to_window (rp_frame *frame);
 void resize_frame_horizontally (rp_frame *frame, int diff);
 void resize_frame_vertically (rp_frame *frame, int diff);
@@ -37,13 +37,13 @@ rp_window *find_window_for_frame (rp_fra
 rp_frame *find_windows_frame (rp_window *win);
 rp_frame *find_frame_next (rp_frame *frame);
 rp_frame *find_frame_prev (rp_frame *frame);
-rp_window *current_window ();
-void init_frame_lists ();
+rp_window *current_window (void);
+void init_frame_lists (void);
 void init_frame_list (rp_screen *screen);
 void set_active_frame (rp_frame *frame);
 void blank_frame (rp_frame *frame);
-void show_frame_indicator ();
-void hide_frame_indicator ();
+void show_frame_indicator (void);
+void hide_frame_indicator (void);
 
 void show_frame_message (char *msg);
 
@@ -51,9 +51,9 @@ rp_frame *find_frame_right (rp_frame *fr
 rp_frame *find_frame_left (rp_frame *frame);
 rp_frame *find_frame_down (rp_frame *frame);
 rp_frame *find_frame_up (rp_frame *frame);
-rp_frame *find_last_frame ();
+rp_frame *find_last_frame (void);
 rp_frame * find_frame_number (int num);
 
-rp_frame *current_frame ();
+rp_frame *current_frame (void);
 
 #endif
Index: src/window.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/window.h,v
retrieving revision 1.12
diff -u -p -r1.12 window.h
--- src/window.h	16 Mar 2006 00:33:35 -0000	1.12
+++ src/window.h	18 May 2006 18:37:55 -0000
@@ -26,10 +26,10 @@
 
 void free_window (rp_window *w);
 rp_window *add_to_window_list (rp_screen *s, Window w);
-void last_window ();
+void last_window (void);
 rp_window *find_window_in_list (Window w, struct list_head *list);
 rp_window *find_window (Window w);
-void maximize_current_window ();
+void maximize_current_window (void);
 void give_window_focus (rp_window *win, rp_window *last_win);
 void set_active_window (rp_window *win);
 void goto_window (rp_window *win);
@@ -53,15 +53,15 @@ rp_window *find_window_prev_with_frame (
 rp_window *find_window_next (rp_window *w);
 rp_window *find_window_next_with_frame (rp_window *w);
 rp_window *find_window_number (int n);
-void sort_window_list_by_number ();
+void sort_window_list_by_number (void);
 
 void insert_into_list (rp_window *win, struct list_head *list);
 
 void print_window_information (rp_group *group, rp_window *win);
 void get_window_list (char *fmt, char *delim, struct sbuf *buffer,
                       int *mark_start, int *mark_end);
-void init_window_stuff ();
-void free_window_stuff ();
+void init_window_stuff (void);
+void free_window_stuff (void);
 
 rp_frame *win_get_frame (rp_window *win);
 
Index: src/xinerama.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/xinerama.h,v
retrieving revision 1.2
diff -u -p -r1.2 xinerama.h
--- src/xinerama.h	16 Mar 2006 00:33:35 -0000	1.2
+++ src/xinerama.h	18 May 2006 18:37:55 -0000
@@ -21,8 +21,8 @@
 #ifndef XINERAMA_H
 #define XINERAMA_H
 
-void init_xinerama();
-void free_xinerama();
+void init_xinerama(void);
+void free_xinerama(void);
 void xinerama_get_screen_info(int sc, int *x, int *y, int *w, int *h);
 
 #endif