[Emacs-diffs] trunk r117933: Fix fallout on MinGW64 from the previous commit.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117933
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-24 13:06:53 +0300
message:
  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'.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/systime.h                  systime.h-20091113204419-o5vbwnq5f7feedwu-510
  src/w32inevt.h                 w32inevt.h-20091113204419-o5vbwnq5f7feedwu-857
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-24 07:17:51 +0000
+++ b/src/ChangeLog     2014-09-24 10:06:53 +0000
@@ -1,3 +1,16 @@
+2014-09-24  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * termhooks.h (enum scroll_bar_part): Begin from 0 to allow...

=== modified file 'src/systime.h'
--- a/src/systime.h     2014-01-01 07:43:34 +0000
+++ b/src/systime.h     2014-09-24 10:06:53 +0000
@@ -19,6 +19,7 @@
 #ifndef EMACS_SYSTIME_H
 #define EMACS_SYSTIME_H
 
+#include <sys/types.h>
 #include <timespec.h>
 
 INLINE_HEADER_BEGIN
@@ -27,7 +28,7 @@
 # ifdef HAVE_X_WINDOWS
 #  include <X11/X.h>
 # else
-typedef unsigned long Time;
+typedef size_t Time;
 # endif
 #endif
 

=== modified file 'src/w32inevt.h'
--- a/src/w32inevt.h    2014-01-01 07:43:34 +0000
+++ b/src/w32inevt.h    2014-09-24 10:06:53 +0000
@@ -27,6 +27,6 @@
                                        Lisp_Object *bar_window,
                                        enum scroll_bar_part *part,
                                        Lisp_Object *x, Lisp_Object *y,
-                                       unsigned long *time);
+                                       Time *time);
 
 #endif /* EMACS_W32INEVT_H */

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2014-09-24 07:17:51 +0000
+++ b/src/w32term.c     2014-09-24 10:06:53 +0000
@@ -3344,11 +3344,11 @@
 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 @@
 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 @@
 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 @@
 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;