summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-09-18 13:33:36 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-09-18 13:33:36 +0400
commit582ed56ca8ca6e4a6f4358deee3be8e227960031 (patch)
tree7185bf6a646c3ab218d3fe370fb512d25f0fcb7e /src/frame.c
parent18da0d8ad4e5036185acbad3238cbfe2aaf3ca66 (diff)
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.
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c
index 997cc9c73a..78cd6914bc 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.