From a3242daa5dcf26ba0f98469e9649812ab7c41746 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 23 Jul 2020 05:51:04 +0200 Subject: [PATCH] Silence more warnings --- core_info.c | 4 +++- frontend/drivers/platform_wiiu.c | 6 ++++++ gfx/gfx_widgets.c | 7 ------- menu/menu_displaylist.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/core_info.c b/core_info.c index 2a6bce2f1c..a016d5f0ea 100644 --- a/core_info.c +++ b/core_info.c @@ -1605,10 +1605,12 @@ bool core_info_get_core_lock(const char *core_path, bool validate_path) if (string_is_empty(core_path)) goto end; + core_info.inf = NULL; + core_info.path = NULL; + /* Check whether core path is to be validated */ if (validate_path) { - core_info.inf = NULL; core_info.path = core_path; if (core_info_find(&core_info)) diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c index dde19827bd..2bdc88c377 100644 --- a/frontend/drivers/platform_wiiu.c +++ b/frontend/drivers/platform_wiiu.c @@ -67,7 +67,9 @@ * The Wii U frontend driver, along with the main() method. */ +#ifndef IS_SALAMANDER static enum frontend_fork wiiu_fork_mode = FRONTEND_FORK_NONE; +#endif static const char *elf_path_cst = WIIU_SD_PATH "retroarch/retroarch.elf"; static bool exists(char *path) @@ -341,7 +343,9 @@ frontend_ctx_driver_t frontend_ctx_wiiu = static void main_setup(void); static void get_arguments(int *argc, char ***argv); +#ifndef IS_SALAMANDER static void main_loop(void); +#endif static void main_teardown(void); static void init_network(void); @@ -439,6 +443,7 @@ static void main_teardown(void) deinit_network(); } +#ifndef IS_SALAMANDER static void main_loop(void) { OSTime start_time; @@ -460,6 +465,7 @@ static void main_loop(void) break; } } +#endif static void SaveCallback(void) { diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index b42966910b..79d16734d3 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -73,13 +73,6 @@ static float gfx_widgets_backdrop_orig[16] = { 0.00, 0.00, 0.00, 0.75, }; -static float gfx_widgets_backdrop[16] = { - 0.00, 0.00, 0.00, 0.75, - 0.00, 0.00, 0.00, 0.75, - 0.00, 0.00, 0.00, 0.75, - 0.00, 0.00, 0.00, 0.75, -}; - /* Icons */ static const char *gfx_widgets_icons_names[MENU_WIDGETS_ICON_LAST] = { diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 805768cb00..d4b27351ab 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -7553,9 +7553,9 @@ unsigned menu_displaylist_build_list( #ifdef HAVE_GFX_WIDGETS bool widgets_supported = video_driver_has_widgets(); bool menu_enable_widgets = settings->bools.menu_enable_widgets; -#endif #ifdef HAVE_SCREENSHOTS bool notification_show_screenshot = settings->bools.notification_show_screenshot; +#endif #endif menu_displaylist_build_info_selective_t build_list[] = { {MENU_ENUM_LABEL_FPS_SHOW, PARSE_ONLY_BOOL, true },