[Emacs-diffs] /srv/bzr/emacs/trunk r100871: * menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS".

[Juanma Barranquero]

------------------------------------------------------------
revno: 100871
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-23 12:32:02 +0200
message:
  * menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS".
modified:
  src/ChangeLog
  src/menu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-23 10:09:27 +0000
+++ b/src/ChangeLog     2010-07-23 10:32:02 +0000
@@ -1,5 +1,8 @@
 2010-07-23  Juanma Barranquero  <address@hidden>
 
+       * menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS";
+       it is called only from NS code.
+
        * w32term.c (my_set_focus): #ifdef away; it is called only from
        "#ifdef 0" code.
 

=== modified file 'src/menu.c'
--- a/src/menu.c        2010-07-08 21:25:08 +0000
+++ b/src/menu.c        2010-07-23 10:32:02 +0000
@@ -133,12 +133,14 @@
   xassert (NILP (menu_items_inuse));
 }
 
+#ifdef HAVE_NS
 static Lisp_Object
 cleanup_popup_menu (Lisp_Object arg)
 {
   discard_menu_items ();
   return Qnil;
 }
+#endif
 
 /* This undoes save_menu_items, and it is called by the specpdl unwind
    mechanism.  */