From 1a1f33668536488bb146bbd83cd0df741c4d9cdc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 14 May 2011 02:03:53 -0700 Subject: [PATCH] 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. * w32gui.h (Time): Define by including "systime.h" rather than by declaring it ourselves. (Bug#8664) --- src/ChangeLog | 8 ++++++++ src/nsterm.m | 6 ++---- src/w32gui.h | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9bdbb9a7d18..dca9a174c34 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2011-05-14 Paul Eggert + + 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. + * w32gui.h (Time): Define by including "systime.h" rather than by + declaring it ourselves. (Bug#8664) + 2011-05-13 Paul Eggert * editfns.c (Fformat): Fix several integer overflow problems. diff --git a/src/nsterm.m b/src/nsterm.m index c4756dc83cd..ac9c44a57a9 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -158,7 +158,7 @@ long context_menu_value = 0; /* display update */ NSPoint last_mouse_motion_position; static NSRect last_mouse_glyph; -static unsigned long last_mouse_movement_time = 0; +static Time last_mouse_movement_time = 0; static Lisp_Object last_mouse_motion_frame; static EmacsScroller *last_mouse_scroll_bar = nil; static struct frame *ns_updating_frame; @@ -1789,7 +1789,7 @@ note_mouse_movement (struct frame *frame, float x, float y) static void ns_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) /* -------------------------------------------------------------------------- External (hook): inform emacs about mouse position and hit parts. If a scrollbar is being dragged, set bar_window, part, x, y, time. @@ -6531,5 +6531,3 @@ baseline level. The default value is nil. */); /* Tell emacs about this window system. */ Fprovide (intern ("ns"), Qnil); } - - diff --git a/src/w32gui.h b/src/w32gui.h index 936709af181..2ba9cb53e22 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -20,6 +20,8 @@ along with GNU Emacs. If not, see . */ #define EMACS_W32GUI_H #include +#include "systime.h" /* for Time */ + /* Local memory management for menus. */ #define local_heap (GetProcessHeap ()) #define local_alloc(n) (HeapAlloc (local_heap, HEAP_ZERO_MEMORY, (n))) @@ -47,7 +49,6 @@ typedef char * XrmDatabase; typedef XGCValues * GC; typedef COLORREF Color; -typedef DWORD Time; typedef HWND Window; typedef HDC Display; /* HDC so it doesn't conflict with xpm lib. */ typedef HCURSOR Cursor; @@ -147,4 +148,3 @@ typedef struct { #endif /* EMACS_W32GUI_H */ - -- 2.39.2