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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 55345027811cdf1910fe644db0858c2d5eb4ff25..9337e83a2a717d86dbbd32818fc5315eb4f99f5b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-18  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       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  <dmantipov@yandex.ru>
 
        * frame.c (x_redo_mouse_highlight): New function

diff --git a/src/dispextern.h b/src/dispextern.h
index 7244c84893d1f7d73196f67813b03eaced57d82b..e1d48b0e4604b0646cd61dd48840ad615f9ae489 100644 (file)
--- 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 997cc9c73aeca0ea6644421445d298d531e053a1..78cd6914bc4255328c892d890d968ac9b9e2596d 100644 (file)
--- 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.