Commit 0521f580 authored by Dan Nicolaescu's avatar Dan Nicolaescu

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.
parent ababf900
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> 2010-07-12 Dan Nicolaescu <dann@ics.uci.edu>
* xterm.c (x_frame_of_widget, x_alloc_nearest_color_for_widget) * xterm.c (x_frame_of_widget, x_alloc_nearest_color_for_widget)
......
...@@ -2676,9 +2676,7 @@ x_window (FRAME_PTR f) ...@@ -2676,9 +2676,7 @@ x_window (FRAME_PTR f)
/* Create and set up the X window for frame F. */ /* Create and set up the X window for frame F. */
void void
x_window (f) x_window (struct frame *f)
struct frame *f;
{ {
XClassHint class_hints; XClassHint class_hints;
XSetWindowAttributes attributes; XSetWindowAttributes attributes;
......
...@@ -2228,9 +2228,7 @@ static struct frame *menu_help_frame; ...@@ -2228,9 +2228,7 @@ static struct frame *menu_help_frame;
keyboard events. */ keyboard events. */
static void static void
menu_help_callback (help_string, pane, item) menu_help_callback (char *help_string, int pane, int item)
char *help_string;
int pane, item;
{ {
extern Lisp_Object Qmenu_item; extern Lisp_Object Qmenu_item;
Lisp_Object *first_item; Lisp_Object *first_item;
...@@ -2255,8 +2253,7 @@ menu_help_callback (help_string, pane, item) ...@@ -2255,8 +2253,7 @@ menu_help_callback (help_string, pane, item)
} }
static Lisp_Object static Lisp_Object
pop_down_menu (arg) pop_down_menu (Lisp_Object arg)
Lisp_Object arg;
{ {
struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg)); struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg)); struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
...@@ -2291,14 +2288,7 @@ pop_down_menu (arg) ...@@ -2291,14 +2288,7 @@ pop_down_menu (arg)
Lisp_Object Lisp_Object
xmenu_show (f, x, y, for_click, keymaps, title, error, timestamp) xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object title, char **error, unsigned int timestamp)
FRAME_PTR f;
int x, y;
int for_click;
int keymaps;
Lisp_Object title;
char **error;
EMACS_UINT timestamp;
{ {
Window root; Window root;
XMenu *menu; XMenu *menu;
......
...@@ -4849,10 +4849,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height) ...@@ -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. */ to move to the very end of the buffer. */
static void static void
x_scroll_bar_set_handle (bar, start, end, rebuild) x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, int rebuild)
struct scroll_bar *bar;
int start, end;
int rebuild;
{ {
int dragging = ! NILP (bar->dragging); int dragging = ! NILP (bar->dragging);
Window w = bar->x_window; Window w = bar->x_window;
...@@ -5294,9 +5291,7 @@ XTjudge_scroll_bars (FRAME_PTR f) ...@@ -5294,9 +5291,7 @@ XTjudge_scroll_bars (FRAME_PTR f)
mark bits. */ mark bits. */
static void static void
x_scroll_bar_expose (bar, event) x_scroll_bar_expose (struct scroll_bar *bar, XEvent *event)
struct scroll_bar *bar;
XEvent *event;
{ {
Window w = bar->x_window; Window w = bar->x_window;
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->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 ...@@ -5396,9 +5391,7 @@ x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_e
mark bits. */ mark bits. */
static void static void
x_scroll_bar_note_movement (bar, event) x_scroll_bar_note_movement (struct scroll_bar *bar, XEvent *event)
struct scroll_bar *bar;
XEvent *event;
{ {
FRAME_PTR f = XFRAME (XWINDOW (bar->window)->frame); FRAME_PTR f = XFRAME (XWINDOW (bar->window)->frame);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment