mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 15:00:45 -08:00
Code Issues Projects Releases Wiki Activity

Fix fallout on MinGW64 from the previous commit.

Browse source 
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'.
This commit is contained in:
Eli Zaretskii 2014-09-24 13:06:53 +03:00
parent 4b930ccbb4
commit d4dfe4ea85
4 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ChangeLog
View file

@ -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...

3
src/systime.h
View file

@ -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

2
src/w32inevt.h
View file

@ -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 */

10
src/w32term.c
View file

@ -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;