Mercurial > emacs
changeset 109374:88a5b905a895
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 12 Jul 2010 12:56:46 -0700 |
| parents | e5ec12c5c82f |
| children | 3e07e13fe30a b3c31bb21485 |
| files | src/ChangeLog src/xfns.c src/xmenu.c src/xterm.c |
| diffstat | 4 files changed, 14 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jul 12 12:49:40 2010 -0700 +++ b/src/ChangeLog Mon Jul 12 12:56:46 2010 -0700 @@ -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)
--- a/src/xfns.c Mon Jul 12 12:49:40 2010 -0700 +++ b/src/xfns.c Mon Jul 12 12:56:46 2010 -0700 @@ -2676,9 +2676,7 @@ /* 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;
--- a/src/xmenu.c Mon Jul 12 12:49:40 2010 -0700 +++ b/src/xmenu.c Mon Jul 12 12:56:46 2010 -0700 @@ -2228,9 +2228,7 @@ 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 @@ } 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 @@ 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;
--- a/src/xterm.c Mon Jul 12 12:49:40 2010 -0700 +++ b/src/xterm.c Mon Jul 12 12:56:46 2010 -0700 @@ -4849,10 +4849,7 @@ 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 @@ 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 @@ 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);