* menu.c (find_and_return_menu_selection) [HAVE_NS]: Remove double-casting in client_...

diff --git a/src/ChangeLog b/src/ChangeLog
index b284d1476c345c7b64daf10ee1679e599019b542..be55c6bc793c979a303da9805afb1d81441f7774 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -13,6 +13,9 @@
        (ns_set_name_as_filename, x-create-frame, ns-get-resource)
        (ns-set-resource): Use ns_app_name instead of NSProcessInfo call.
 
+       * menu.c (find_and_return_menu_selection) [HAVE_NS]: Remove
+       double-casting in client_data comparison.
+
 2009-09-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * keyboard.c (make_lispy_event): Remember last wheel direction.

diff --git a/src/menu.c b/src/menu.c
index 940986fd536cdc075976c667b949fbacbc4ef23e..5331cbc31448e7489e8cbc055d410b9e39ac08bb 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -1005,7 +1005,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
         {
           entry
             = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];
-          if ((int) (EMACS_INT)client_data ==  (int)(&XVECTOR (menu_items)->contents[i]))
+          if ((EMACS_INT)client_data ==  (EMACS_INT)(&XVECTOR (menu_items)->contents[i]))
             {
               if (keymaps != 0)
                 {
@@ -1025,7 +1025,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
     }
   return Qnil;
 }
-#endif
+#endif  /* HAVE_NS */
 
 void
 syms_of_menu ()