* xmenu.c (dialog_selection_callback) [!USE_GTK]: Cast to intptr_t,

not to EMACS_INT, to avoid GCC warning.

diff --git a/src/ChangeLog b/src/ChangeLog
index 638e0c6a0b1111291dca4477814b087e36d65c0c..f4de3d991d9cd9e797c73f30b807c6b66bfcd18e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-09  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xmenu.c (dialog_selection_callback) [!USE_GTK]: Cast to intptr_t,
+       not to EMACS_INT, to avoid GCC warning.
+
        * xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals.
 
        * buffer.h (PTR_BYTE_POS): Don't assume a byte count fits in 'unsigned'.

diff --git a/src/xmenu.c b/src/xmenu.c
index 7d7515a8f2552d6ea6f9a6b6183f0df9e66e4763..0aad8f454af89b09a0c95a45c0c6212f711e515c 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1919,9 +1919,9 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv)
 static void
 dialog_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
 {
-  /* The EMACS_INT cast avoids a warning.  There's no problem
+  /* Treat the pointer as an integer.  There's no problem
      as long as pointers have enough bits to hold small integers.  */
-  if ((int) (EMACS_INT) client_data != -1)
+  if ((intptr_t) client_data != -1)
     menu_item_selection = (Lisp_Object *) client_data;
 
   BLOCK_INPUT;