diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-14 02:03:53 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-14 02:03:53 -0700 |
| commit | 1a1f33668536488bb146bbd83cd0df741c4d9cdc (patch) | |
| tree | f1f561596baac11716afa2b5b82c2245b91b05c8 /src/w32gui.h | |
| parent | 66699ad31291ec329760966945ec4d4ad4688586 (diff) | |
| download | emacs-1a1f33668536488bb146bbd83cd0df741c4d9cdc.tar.gz | |
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)
Diffstat (limited to 'src/w32gui.h')
| -rw-r--r-- | src/w32gui.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 <http://www.gnu.org/licenses/>. */ #define EMACS_W32GUI_H #include <windows.h> +#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 */ - |