From b5368c9423cb4db27885811349af8080dbada74e Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Sun, 24 Feb 2019 12:08:30 +0000 Subject: [PATCH 1/2] (menu_animation.c) Use semi-colon properly for TICKER_SPACER_DEFAULT Defines should not have semi-colons. Correct the fix in 3cbae9c. --- menu/menu_animation.c | 2 +- menu/menu_animation.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/menu/menu_animation.c b/menu/menu_animation.c index e5f861e36a..3a1bbb5598 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -63,7 +63,7 @@ typedef struct menu_animation menu_animation_t; #define TICKER_SPEED 333 #define TICKER_SLOW_SPEED 1600 -static const char ticker_spacer_default[] = TICKER_SPACER_DEFAULT +static const char ticker_spacer_default[] = TICKER_SPACER_DEFAULT; static menu_animation_t anim; static retro_time_t cur_time = 0; diff --git a/menu/menu_animation.h b/menu/menu_animation.h index 465991c14f..3cf0e1f972 100644 --- a/menu/menu_animation.h +++ b/menu/menu_animation.h @@ -25,7 +25,7 @@ RETRO_BEGIN_DECLS -#define TICKER_SPACER_DEFAULT " | "; +#define TICKER_SPACER_DEFAULT " | " typedef float (*easing_cb) (float, float, float, float); typedef void (*tween_cb) (void*); From 147bd5e0516ef965e9cf60fbee14840245a75957 Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Sun, 24 Feb 2019 12:10:18 +0000 Subject: [PATCH 2/2] (rgui.c) silence warning in C89_BUILD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: menu/drivers/rgui.c: In function ‘rgui_render’: menu/drivers/rgui.c:1690:10: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] menu_entry_t entry; ^~~~~~~~~~~~ --- menu/drivers/rgui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 8bdbe5a8b5..3d7581f84e 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -1669,6 +1669,7 @@ static void rgui_render(void *data, bool is_idle) char message[255]; char entry_title_buf[255]; char type_str_buf[255]; + menu_entry_t entry; char *entry_path = NULL; unsigned entry_spacing = 0; size_t entry_title_max_len = 0; @@ -1687,7 +1688,6 @@ static void rgui_render(void *data, bool is_idle) type_str_buf[0] = '\0'; /* Get current entry */ - menu_entry_t entry; menu_entry_init(&entry); menu_entry_get(&entry, 0, (unsigned)i, NULL, true);