From 582ed56ca8ca6e4a6f4358deee3be8e227960031 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 18 Sep 2013 13:33:36 +0400 Subject: [PATCH] Ifdef away recent changes which aren't relevant to NS port. * dispextern.h (x_mouse_grabbed, x_redo_mouse_highlight) [!HAVE_NS]: Declare as such. * frame.c (x_mouse_grabbed, x_redo_mouse_highlight) [!HAVE_NS]: Define as such. --- src/ChangeLog | 8 ++++++++ src/dispextern.h | 5 ++++- src/frame.c | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 55345027811..9337e83a2a7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2013-09-18 Dmitry Antipov + + Ifdef away recent changes which aren't relevant to NS port. + * dispextern.h (x_mouse_grabbed, x_redo_mouse_highlight) + [!HAVE_NS]: Declare as such. + * frame.c (x_mouse_grabbed, x_redo_mouse_highlight) + [!HAVE_NS]: Define as such. + 2013-09-18 Dmitry Antipov * frame.c (x_redo_mouse_highlight): New function diff --git a/src/dispextern.h b/src/dispextern.h index 7244c84893d..e1d48b0e460 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3530,7 +3530,6 @@ enum resource_types RES_TYPE_BOOLEAN_NUMBER }; -extern bool x_mouse_grabbed (Display_Info *); extern Display_Info *check_x_display_info (Lisp_Object); extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object, Lisp_Object, const char *, const char *class, @@ -3545,7 +3544,11 @@ extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object, enum resource_types); extern char *x_get_string_resource (XrmDatabase, const char *, const char *); + +#ifndef HAVE_NS /* These both used on W32 and X only. */ +extern bool x_mouse_grabbed (Display_Info *); extern void x_redo_mouse_highlight (Display_Info *); +#endif /* HAVE_NS */ #endif /* HAVE_WINDOW_SYSTEM */ diff --git a/src/frame.c b/src/frame.c index 997cc9c73ae..78cd6914bc4 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3432,6 +3432,8 @@ x_set_alpha (struct frame *f, Lisp_Object arg, Lisp_Object oldval) return; } +#ifndef HAVE_NS + /* Non-zero if mouse is grabbed on DPYINFO and we know the frame where it is. */ @@ -3455,6 +3457,8 @@ x_redo_mouse_highlight (Display_Info *dpyinfo) dpyinfo->last_mouse_motion_y); } +#endif /* HAVE_NS */ + /* Subroutines of creating an X frame. */ /* Make sure that Vx_resource_name is set to a reasonable value. -- 2.39.2