aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32term.c
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-24 13:06:53 +0300
committerEli Zaretskii2014-09-24 13:06:53 +0300
commitd4dfe4ea85328f7afd288cd43e141430db33e4e8 (patch)
treed3091cc82bfc7270cba859e6ea7e693a1a8391c1 /src/w32term.c
parent4b930ccbb4fc4b848f318e09eddd172c2acf9b9b (diff)
downloademacs-d4dfe4ea85328f7afd288cd43e141430db33e4e8.tar.gz
emacs-d4dfe4ea85328f7afd288cd43e141430db33e4e8.zip
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'.
Diffstat (limited to 'src/w32term.c')
-rw-r--r--src/w32term.c10
1 files changed, 5 insertions, 5 deletions
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);
3344static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *, 3344static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *,
3345 enum scroll_bar_part *, 3345 enum scroll_bar_part *,
3346 Lisp_Object *, Lisp_Object *, 3346 Lisp_Object *, Lisp_Object *,
3347 unsigned long *); 3347 Time *);
3348static void x_horizontal_scroll_bar_report_motion (struct frame **, Lisp_Object *, 3348static void x_horizontal_scroll_bar_report_motion (struct frame **, Lisp_Object *,
3349 enum scroll_bar_part *, 3349 enum scroll_bar_part *,
3350 Lisp_Object *, Lisp_Object *, 3350 Lisp_Object *, Lisp_Object *,
3351 unsigned long *); 3351 Time *);
3352static void x_check_fullscreen (struct frame *); 3352static void x_check_fullscreen (struct frame *);
3353 3353
3354static void 3354static void
@@ -3380,7 +3380,7 @@ w32_define_cursor (Window window, Cursor cursor)
3380static void 3380static void
3381w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, 3381w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
3382 enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, 3382 enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
3383 unsigned long *time) 3383 Time *time)
3384{ 3384{
3385 struct frame *f1; 3385 struct frame *f1;
3386 struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp); 3386 struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
@@ -4374,7 +4374,7 @@ static void
4374x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, 4374x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window,
4375 enum scroll_bar_part *part, 4375 enum scroll_bar_part *part,
4376 Lisp_Object *x, Lisp_Object *y, 4376 Lisp_Object *x, Lisp_Object *y,
4377 unsigned long *time) 4377 Time *time)
4378{ 4378{
4379 struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp); 4379 struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
4380 struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar; 4380 struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar;
@@ -4424,7 +4424,7 @@ static void
4424x_horizontal_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, 4424x_horizontal_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window,
4425 enum scroll_bar_part *part, 4425 enum scroll_bar_part *part,
4426 Lisp_Object *x, Lisp_Object *y, 4426 Lisp_Object *x, Lisp_Object *y,
4427 unsigned long *time) 4427 Time *time)
4428{ 4428{
4429 struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp); 4429 struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
4430 struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar; 4430 struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar;