2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e8b8484a1b..6a0475f5741 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/menu.c b/src/menu.c
index a424200fb3e..321dc2677a1 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -133,12 +133,14 @@ discard_menu_items (void)
   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.  */