From d4dfe4ea85328f7afd288cd43e141430db33e4e8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii <eliz@gnu.org> Date: Wed, 24 Sep 2014 13:06:53 +0300 Subject: Fix fallout on MinGW64 from the previous commit. src/systime.h (Time): Define as size_t, to be consistent with 64-bit Windows builds, where 'long' is a 32-bit type. src/w32inevt.h (w32_console_mouse_position): Update the argument types to use 'Time'. src/w32term.c (w32_mouse_position) (x_horizontal_scroll_bar_report_motion) (x_scroll_bar_report_motion): Update the argument types to use 'Time'. --- src/w32term.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/w32term.c') diff --git a/src/w32term.c b/src/w32term.c index 0e10738e6f9..4f8482736c3 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3344,11 +3344,11 @@ static struct scroll_bar *x_window_to_scroll_bar (Window, int); static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *, enum scroll_bar_part *, Lisp_Object *, Lisp_Object *, - unsigned long *); + Time *); static void x_horizontal_scroll_bar_report_motion (struct frame **, Lisp_Object *, enum scroll_bar_part *, Lisp_Object *, Lisp_Object *, - unsigned long *); + Time *); static void x_check_fullscreen (struct frame *); static void @@ -3380,7 +3380,7 @@ w32_define_cursor (Window window, Cursor cursor) static void w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, - unsigned long *time) + Time *time) { struct frame *f1; struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp); @@ -4374,7 +4374,7 @@ static void x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, - unsigned long *time) + Time *time) { struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp); struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar; @@ -4424,7 +4424,7 @@ static void x_horizontal_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, - unsigned long *time) + Time *time) { struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp); struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar; -- cgit v1.2.1