diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-07-11 00:22:26 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-07-11 00:22:26 +0000 |
commit | 1bc67c81b60539576c0073e8acd2ffa7d43ac882 (patch) | |
tree | 8e8953e0cb7926b84da228abf8476b2f2e2678ab /apps/menu.c | |
parent | 7ad3a333a3af8a6ca3d6f1b4b025b0b7245684dd (diff) | |
download | rockbox-1bc67c81b60539576c0073e8acd2ffa7d43ac882.tar.gz rockbox-1bc67c81b60539576c0073e8acd2ffa7d43ac882.zip |
Fix type mismatch warnings and errors exposed when building with EABI toolchain.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21769 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r-- | apps/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/menu.c b/apps/menu.c index 653dc09aec..aff84c72e3 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -131,7 +131,7 @@ static char * get_menu_item_name(int selected_item, | |||
131 | return P2STR(menu->callback_and_desc->desc); | 131 | return P2STR(menu->callback_and_desc->desc); |
132 | } | 132 | } |
133 | #ifdef HAVE_LCD_BITMAP | 133 | #ifdef HAVE_LCD_BITMAP |
134 | static int menu_get_icon(int selected_item, void * data) | 134 | static enum themable_icons menu_get_icon(int selected_item, void * data) |
135 | { | 135 | { |
136 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; | 136 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; |
137 | int menu_icon = Icon_NOICON; | 137 | int menu_icon = Icon_NOICON; |