aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-05-14 12:06:08 -0700
committerPaul Eggert2011-05-14 12:06:08 -0700
commit9fbd68410f1680b5b9bc2d56c239183ea13c7d58 (patch)
tree1663f0fd3368bceb368104ab73750d7b097f2395 /src
parent1a1f33668536488bb146bbd83cd0df741c4d9cdc (diff)
downloademacs-9fbd68410f1680b5b9bc2d56c239183ea13c7d58.tar.gz
emacs-9fbd68410f1680b5b9bc2d56c239183ea13c7d58.zip
* msdos.c (mouse_get_pos): Likewise.
* w32inevt.c (movement_time, w32_console_mouse_position): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/msdos.c2
-rw-r--r--src/w32inevt.c5
3 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dca9a174c34..84575a82eb6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
3 Fixups, following up to the user-interface timestamp change. 3 Fixups, following up to the user-interface timestamp change.
4 * nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time 4 * nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time
5 for UI timestamps, instead of unsigned long. 5 for UI timestamps, instead of unsigned long.
6 * msdos.c (mouse_get_pos): Likewise.
7 * w32inevt.c (movement_time, w32_console_mouse_position): Likewise.
6 * w32gui.h (Time): Define by including "systime.h" rather than by 8 * w32gui.h (Time): Define by including "systime.h" rather than by
7 declaring it ourselves. (Bug#8664) 9 declaring it ourselves. (Bug#8664)
8 10
diff --git a/src/msdos.c b/src/msdos.c
index 3dc586e42f5..73804df55cc 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -287,7 +287,7 @@ mouse_button_depressed (int b, int *xp, int *yp)
287void 287void
288mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window, 288mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
289 enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, 289 enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
290 unsigned long *time) 290 Time *time)
291{ 291{
292 int ix, iy; 292 int ix, iy;
293 Lisp_Object frame, tail; 293 Lisp_Object frame, tail;
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 465f5ccb70f..fddde61663f 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -45,7 +45,7 @@ extern HANDLE keyboard_handle;
45 45
46/* Info for last mouse motion */ 46/* Info for last mouse motion */
47static COORD movement_pos; 47static COORD movement_pos;
48static DWORD movement_time; 48static Time movement_time;
49 49
50/* from w32fns.c */ 50/* from w32fns.c */
51extern unsigned int map_keypad_keys (unsigned int, unsigned int); 51extern unsigned int map_keypad_keys (unsigned int, unsigned int);
@@ -544,7 +544,7 @@ w32_console_mouse_position (FRAME_PTR *f,
544 enum scroll_bar_part *part, 544 enum scroll_bar_part *part,
545 Lisp_Object *x, 545 Lisp_Object *x,
546 Lisp_Object *y, 546 Lisp_Object *y,
547 unsigned long *time) 547 Time *time)
548{ 548{
549 BLOCK_INPUT; 549 BLOCK_INPUT;
550 550
@@ -756,4 +756,3 @@ w32_console_read_socket (struct terminal *terminal,
756 UNBLOCK_INPUT; 756 UNBLOCK_INPUT;
757 return ret; 757 return ret;
758} 758}
759