Convert function definitions to standard C.

* src/xterm.c (x_scroll_bar_set_handle, x_scroll_bar_expose)
(_scroll_bar_note_movement): Convert definitions to standard C.
* src/xmenu.c (menu_help_callback, pop_down_menu, xmenu_show):
* src/xfns.c (hack_wm_protocols, x_window, x_window): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index a27fc7484f78bc3c3f0be535d762aa77290edee8..667a82c14ec5c5073ebc0d24f37c7c3c65959f60 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * xterm.c (x_scroll_bar_set_handle, x_scroll_bar_expose)
+       (_scroll_bar_note_movement): Convert definitions to standard C.
+       * xmenu.c (menu_help_callback, pop_down_menu, xmenu_show):
+       * xfns.c (hack_wm_protocols, x_window, x_window): Likewise.
+
 2010-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * xterm.c (x_frame_of_widget, x_alloc_nearest_color_for_widget)

diff --git a/src/xfns.c b/src/xfns.c
index e4a073072f04d08632de42a4e27a6a2488ed38b8..c21357818114649e177be8f5441d823accb03473 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2676,9 +2676,7 @@ x_window (FRAME_PTR f)
 /* Create and set up the X window for frame F.  */
 
 void
-x_window (f)
-     struct frame *f;
-
+x_window (struct frame *f)
 {
   XClassHint class_hints;
   XSetWindowAttributes attributes;

diff --git a/src/xmenu.c b/src/xmenu.c
index d9c71b0cf2fad63aaded3e0b97c2fc4e5809d61d..b0bdbcfecaaad2d2c9cf5f6111a88dbe8249d419 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2228,9 +2228,7 @@ static struct frame *menu_help_frame;
    keyboard events.  */
 
 static void
-menu_help_callback (help_string, pane, item)
-     char *help_string;
-     int pane, item;
+menu_help_callback (char *help_string, int pane, int item)
 {
   extern Lisp_Object Qmenu_item;
   Lisp_Object *first_item;
@@ -2255,8 +2253,7 @@ menu_help_callback (help_string, pane, item)
 }
 
 static Lisp_Object
-pop_down_menu (arg)
-     Lisp_Object arg;
+pop_down_menu (Lisp_Object arg)
 {
   struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
   struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
@@ -2291,14 +2288,7 @@ pop_down_menu (arg)
 
 
 Lisp_Object
-xmenu_show (f, x, y, for_click, keymaps, title, error, timestamp)
-     FRAME_PTR f;
-     int x, y;
-     int for_click;
-     int keymaps;
-     Lisp_Object title;
-     char **error;
-     EMACS_UINT timestamp;
+xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object title, char **error, unsigned int timestamp)
 {
   Window root;
   XMenu *menu;

diff --git a/src/xterm.c b/src/xterm.c
index c78408382bd563d354bce5f36794914060535d17..649e5c2d6748dcbe44162eca1ad82a99a1f03e5d 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4849,10 +4849,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height)
    to move to the very end of the buffer.  */
 
 static void
-x_scroll_bar_set_handle (bar, start, end, rebuild)
-     struct scroll_bar *bar;
-     int start, end;
-     int rebuild;
+x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, int rebuild)
 {
   int dragging = ! NILP (bar->dragging);
   Window w = bar->x_window;
@@ -5294,9 +5291,7 @@ XTjudge_scroll_bars (FRAME_PTR f)
    mark bits.  */
 
 static void
-x_scroll_bar_expose (bar, event)
-     struct scroll_bar *bar;
-     XEvent *event;
+x_scroll_bar_expose (struct scroll_bar *bar, XEvent *event)
 {
   Window w = bar->x_window;
   FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
@@ -5396,9 +5391,7 @@ x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_e
    mark bits.  */
 
 static void
-x_scroll_bar_note_movement (bar, event)
-     struct scroll_bar *bar;
-     XEvent *event;
+x_scroll_bar_note_movement (struct scroll_bar *bar, XEvent *event)
 {
   FRAME_PTR f = XFRAME (XWINDOW (bar->window)->frame);