merge trunk

[gnu-emacs] / src / xterm.h

diff --git a/src/xterm.h b/src/xterm.h
index fbd638fe73bf26a6b4cac8b0336302677a126758..1b90b6d8ff4f8f99e4d30c41384278341bd6d5c8 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -989,8 +989,7 @@ extern void x_mouse_leave (struct x_display_info *);
 #ifdef USE_X_TOOLKIT
 extern int x_dispatch_event (XEvent *, Display *);
 #endif
-extern unsigned int x_x_to_emacs_modifiers (struct x_display_info *,
-                                            unsigned);
+extern EMACS_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 *);