From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 9 Jun 2011 01:12:45 +0000 (-0700)
Subject: * xmenu.c (dialog_selection_callback) [!USE_GTK]: Cast to intptr_t,
X-Git-Tag: emacs-pretest-24.0.90~104^2~548^2~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41cb286c61f5b5b317bf4038ff0cd43dafd9a21b;p=emacs.git

* 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 638e0c6a0b1..f4de3d991d9 100644
--- 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 7d7515a8f25..0aad8f454af 100644
--- 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;