# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1279881122 -7200
# Node ID bf6283e6c0a32b7006ac64c79f513e7cacac9e44
# Parent  2899bda31dbe4bfb42b980830f717055b8320b6d
* menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS".

diff -r 2899bda31dbe -r bf6283e6c0a3 src/ChangeLog
--- a/src/ChangeLog	Fri Jul 23 12:09:27 2010 +0200
+++ b/src/ChangeLog	Fri Jul 23 12:32:02 2010 +0200
@@ -1,5 +1,8 @@
 2010-07-23  Juanma Barranquero  <lekktu@gmail.com>
 
+	* 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.
 
diff -r 2899bda31dbe -r bf6283e6c0a3 src/menu.c
--- a/src/menu.c	Fri Jul 23 12:09:27 2010 +0200
+++ b/src/menu.c	Fri Jul 23 12:32:02 2010 +0200
@@ -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.  */