From 1bd61f53f45da77112313de99de0c8f1fa513bdb Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 7 Mar 2012 13:08:47 +0100 Subject: menu: Save data as short, (void *) was pointless. Fixes amd64 compiler warnings. --- src/menu.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/menu.h') diff --git a/src/menu.h b/src/menu.h index 3cbc346..a101976 100644 --- a/src/menu.h +++ b/src/menu.h @@ -91,7 +91,7 @@ struct _feh_menu_item { char *submenu; int action; void (*func_free) (void *data); - void *data; + unsigned short data; feh_menu_item *next; feh_menu_item *prev; unsigned char is_toggle; @@ -131,11 +131,11 @@ void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, feh_menu_item * void feh_menu_hide(feh_menu * m, int func_free); void feh_menu_show(feh_menu * m); feh_menu_item *feh_menu_add_entry(feh_menu * m, char *text, - Imlib_Image icon, char *submenu, - int action, void *data, void (*func_free) (void *data)); + Imlib_Image icon, char *submenu, + int action, unsigned short data, void (*func_free) (void *data)); feh_menu_item *feh_menu_add_toggle_entry(feh_menu * m, char *text, - Imlib_Image icon, char *submenu, - int action, void *data, void (*func_free) (void *data), int setting); + Imlib_Image icon, char *submenu, + int action, unsigned short data, void (*func_free) (void *data), int setting); void feh_menu_entry_get_size(feh_menu_item * i, int *w, int *h); void feh_menu_calc_size(feh_menu * m); void feh_menu_draw_item(feh_menu_item * i, Imlib_Image im, int ox, int oy); -- cgit v1.2.3