4 files changed, 21 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8f312a3ab3e..ca0e9302578 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2014-09-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * systime.h (Time): Define as size_t, to be consistent with 64-bit
+        Windows builds, where 'long' is a 32-bit type.
+
+        * w32inevt.h (w32_console_mouse_position): Update the argument
+        types to use 'Time'.
+
+        * w32term.c (w32_mouse_position)
+        (x_horizontal_scroll_bar_report_motion)
+        (x_scroll_bar_report_motion): Update the argument types to use
+        'Time'.
+
 2014-09-24  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * termhooks.h (enum scroll_bar_part): Begin from 0 to allow...
diff --git a/src/systime.h b/src/systime.h
index a834bce76dc..30a13d0ebcf 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef EMACS_SYSTIME_H
 #define EMACS_SYSTIME_H
 
+#include <sys/types.h>
 #include <timespec.h>
 
 INLINE_HEADER_BEGIN
@@ -27,7 +28,7 @@ INLINE_HEADER_BEGIN
 # ifdef HAVE_X_WINDOWS
 #  include <X11/X.h>
 # else
-typedef unsigned long Time;
+typedef size_t Time;
 # endif
 #endif
 
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 9117453e721..c4836211bc9 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -27,6 +27,6 @@ extern void w32_console_mouse_position (struct frame **f, int insist,
                                         Lisp_Object *bar_window,
                                         enum scroll_bar_part *part,
                                         Lisp_Object *x, Lisp_Object *y,
-                                        unsigned long *time);
+                                        Time *time);
 
 #endif /* EMACS_W32INEVT_H */
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;