[Emacs-diffs] trunk r114376: Ifdef away recent changes which aren't relevant to NS port.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114376
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-09-18 13:33:36 +0400
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispextern.h               
dispextern.h-20091113204419-o5vbwnq5f7feedwu-218
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-18 09:23:10 +0000
+++ b/src/ChangeLog     2013-09-18 09:33:36 +0000
@@ -1,5 +1,13 @@
 2013-09-18  Dmitry Antipov  <address@hidden>
 
+       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  <address@hidden>
+
        * frame.c (x_redo_mouse_highlight): New function
        to factor out common code used in W32 and X ports.
        * dispextern.h (x_redo_mouse_highlight): Add prototype.

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2013-09-18 09:23:10 +0000
+++ b/src/dispextern.h  2013-09-18 09:33:36 +0000
@@ -3530,7 +3530,6 @@
   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 @@
                                         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 */
 

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-18 09:23:10 +0000
+++ b/src/frame.c       2013-09-18 09:33:36 +0000
@@ -3432,6 +3432,8 @@
   return;
 }
 
+#ifndef HAVE_NS
+
 /* Non-zero if mouse is grabbed on DPYINFO
    and we know the frame where it is.  */
 
@@ -3455,6 +3457,8 @@
                          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.