Commit 67840e66 authored by Paul Eggert's avatar Paul Eggert

Fix minor problems found by static checking.

* keyboard.c (poll_for_input_1, input_polling_used):
Define only if HAVE_NTGUI.
* xmenu.c (popup_activate_callback): Omit unnecessary
check against USE_X_TOOLKIT, which must be defined here anyway.
* xterm.c, xterm.h (x_dispatch_event) [! (USE_X_TOOLKIT || USE_MOTIF)]:
Now static.
parent 73c8ceea
2013-12-07 Paul Eggert <eggert@cs.ucla.edu>
Fix minor problems found by static checking.
* keyboard.c (poll_for_input_1, input_polling_used):
Define only if HAVE_NTGUI.
* xmenu.c (popup_activate_callback): Omit unnecessary
check against USE_X_TOOLKIT, which must be defined here anyway.
* xterm.c, xterm.h (x_dispatch_event) [! (USE_X_TOOLKIT || USE_MOTIF)]:
Now static.
2013-12-07 Martin Rudalics <rudalics@gmx.at>
* w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup.
......
......@@ -1954,10 +1954,8 @@ int poll_suppress_count;
static struct atimer *poll_timer;
/* Poll for input, so that we catch a C-g if it comes in. This
function is called from x_make_frame_visible, see comment
there. */
#ifdef HAVE_NTGUI
/* Poll for input, so that we catch a C-g if it comes in. */
void
poll_for_input_1 (void)
{
......@@ -1965,6 +1963,7 @@ poll_for_input_1 (void)
&& !waiting_for_input)
gobble_input ();
}
#endif
/* Timer callback function for poll_timer. TIMER is equal to
poll_timer. */
......@@ -2016,6 +2015,8 @@ start_polling (void)
#endif
}
#ifdef HAVE_NTGUI
/* True if we are using polling to handle input asynchronously. */
bool
......@@ -2030,6 +2031,7 @@ input_polling_used (void)
return 0;
#endif
}
#endif
/* Turn off polling. */
......
......@@ -510,9 +510,7 @@ static void
popup_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
{
popup_activated_flag = 1;
#ifdef USE_X_TOOLKIT
x_activate_timeout_atimer ();
#endif
}
#endif
......
......@@ -248,6 +248,9 @@ static void x_sync_with_move (struct frame *, int, int, int);
static int handle_one_xevent (struct x_display_info *,
const XEvent *, int *,
struct input_event *);
#if ! (defined USE_X_TOOLKIT || defined USE_MOTIF)
static int x_dispatch_event (XEvent *, Display *);
#endif
/* Don't declare this _Noreturn because we want no
interference with debugging failing X calls. */
static void x_connection_closed (Display *, const char *);
......
......@@ -945,7 +945,9 @@ extern void x_clear_area (Display *, Window, int, int, int, int);
extern void x_mouse_leave (struct x_display_info *);
#endif
#if defined USE_X_TOOLKIT || defined USE_MOTIF
extern int x_dispatch_event (XEvent *, Display *);
#endif
extern int x_x_to_emacs_modifiers (struct x_display_info *, int);
extern int x_display_pixel_height (struct x_display_info *);
extern int x_display_pixel_width (struct x_display_info *);
......
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