Commit 41cb286c authored by Paul Eggert's avatar Paul Eggert

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

not to EMACS_INT, to avoid GCC warning.
parent 4a1b9832
2011-06-09 Paul Eggert <eggert@cs.ucla.edu> 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. * 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'. * buffer.h (PTR_BYTE_POS): Don't assume a byte count fits in 'unsigned'.
......
...@@ -1919,9 +1919,9 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv) ...@@ -1919,9 +1919,9 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv)
static void static void
dialog_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data) 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. */ 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; menu_item_selection = (Lisp_Object *) client_data;
BLOCK_INPUT; BLOCK_INPUT;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment