From 872e8ffb991f7f1bbe8b974242c1c983727ca131 Mon Sep 17 00:00:00 2001 From: natinusala Date: Sat, 4 May 2019 22:24:59 +0200 Subject: [PATCH] Fix multiple CXX warning --- menu/drivers/ozone/ozone.c | 2 +- menu/drivers/xmb.c | 2 +- menu/widgets/menu_widgets.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c index 3202cc2be9..45012ccfd3 100644 --- a/menu/drivers/ozone/ozone.c +++ b/menu/drivers/ozone/ozone.c @@ -2139,7 +2139,7 @@ static bool ozone_get_load_content_animation_data(void *userdata, menu_texture_i if (ozone->categories_selection_ptr > ozone->system_tab_end) { - ozone_node_t *node = file_list_get_userdata_at_offset(ozone->horizontal_list, ozone->categories_selection_ptr - ozone->system_tab_end-1); + ozone_node_t *node = (ozone_node_t*) file_list_get_userdata_at_offset(ozone->horizontal_list, ozone->categories_selection_ptr - ozone->system_tab_end-1); *icon = node->icon; *playlist_name = node->console_name; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index e51015dace..b929eb6294 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -5638,7 +5638,7 @@ static bool xmb_get_load_content_animation_data(void *userdata, menu_texture_ite if (xmb->categories_selection_ptr > xmb->system_tab_end) { - xmb_node_t *node = file_list_get_userdata_at_offset(xmb->horizontal_list, xmb->categories_selection_ptr - xmb->system_tab_end-1); + xmb_node_t *node = (xmb_node_t*) file_list_get_userdata_at_offset(xmb->horizontal_list, xmb->categories_selection_ptr - xmb->system_tab_end-1); *icon = node->icon; *playlist_name = xmb->title_name; diff --git a/menu/widgets/menu_widgets.c b/menu/widgets/menu_widgets.c index aec1813144..e6c15f4ec5 100644 --- a/menu/widgets/menu_widgets.c +++ b/menu/widgets/menu_widgets.c @@ -210,7 +210,7 @@ enum menu_widgets_icon MENU_WIDGETS_ICON_LAST }; -static char *menu_widgets_icons_names[MENU_WIDGETS_ICON_LAST] = { +static const char *menu_widgets_icons_names[MENU_WIDGETS_ICON_LAST] = { "menu_volume_med.png", "menu_volume_max.png", "menu_volume_min.png", @@ -1609,7 +1609,7 @@ void menu_widgets_frame(video_frame_info_t *video_info) /* FPS Counter */ if (video_info->fps_show || video_info->framecount_show) { - char *text = *menu_widgets_fps_text == '\0' ? "n/a" : menu_widgets_fps_text; + const char *text = *menu_widgets_fps_text == '\0' ? "n/a" : menu_widgets_fps_text; int text_width = font_driver_get_message_width(font_regular, text, strlen(text), 1.0f); int total_width = text_width + simple_widget_padding * 2;