* msdos.c (mouse_get_pos): Likewise.

* w32inevt.c (movement_time, w32_console_mouse_position): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index dca9a174c34446a5b2494243e4c8f86c0c440fd4..84575a82eb6ffe6a6e69141f095f830249f931ac 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
        Fixups, following up to the user-interface timestamp change.
        * nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time
        for UI timestamps, instead of unsigned long.
+       * msdos.c (mouse_get_pos): Likewise.
+       * w32inevt.c (movement_time, w32_console_mouse_position): Likewise.
        * w32gui.h (Time): Define by including "systime.h" rather than by
        declaring it ourselves.  (Bug#8664)
 

diff --git a/src/msdos.c b/src/msdos.c
index 3dc586e42f5341423ea038cc5b8b314856fcc051..73804df55ccfa6a4b60c1ee8d52009e74f576548 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -287,7 +287,7 @@ mouse_button_depressed (int b, int *xp, int *yp)
 void
 mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
               enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
-              unsigned long *time)
+              Time *time)
 {
   int ix, iy;
   Lisp_Object frame, tail;

diff --git a/src/w32inevt.c b/src/w32inevt.c
index 465f5ccb70fc04a57676d38baba22dfc08ef8f4a..fddde61663f1b9bf2e9a11649f7052a8ef181833 100644 (file)
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -45,7 +45,7 @@ extern HANDLE keyboard_handle;
 
 /* Info for last mouse motion */
 static COORD movement_pos;
-static DWORD movement_time;
+static Time movement_time;
 
 /* from w32fns.c */
 extern unsigned int map_keypad_keys (unsigned int, unsigned int);
@@ -544,7 +544,7 @@ w32_console_mouse_position (FRAME_PTR *f,
                            enum scroll_bar_part *part,
                            Lisp_Object *x,
                            Lisp_Object *y,
-                           unsigned long *time)
+                           Time *time)
 {
   BLOCK_INPUT;
 
@@ -756,4 +756,3 @@ w32_console_read_socket (struct terminal *terminal,
   UNBLOCK_INPUT;
   return ret;
 }
-