From f8a73398c4899c621ee1f7bee424ce47b122c716 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 8 Nov 2014 03:02:58 +0100 Subject: [PATCH] (XMB/Lakka) Prevent variable shadowing --- menu/disp/lakka.c | 4 ++-- menu/disp/xmb.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/menu/disp/lakka.c b/menu/disp/lakka.c index f45490c5b5..28150c5aa8 100644 --- a/menu/disp/lakka.c +++ b/menu/disp/lakka.c @@ -661,7 +661,7 @@ static GLuint lakka_png_texture_load(const char* file_name) static bool lakka_font_init_first(const gl_font_renderer_t **font_driver, void **font_handle, void *video_data, const char *font_path, - float font_size) + float lakka_font_size) { if (g_settings.video.threaded && !g_extern.system.hw_render_callback.context_type) @@ -672,7 +672,7 @@ static bool lakka_font_init_first(const gl_font_renderer_t **font_driver, thr->cmd_data.font_init.font_handle = font_handle; thr->cmd_data.font_init.video_data = video_data; thr->cmd_data.font_init.font_path = font_path; - thr->cmd_data.font_init.font_size = font_size; + thr->cmd_data.font_init.font_size = lakka_font_size; thr->send_cmd_func(thr, CMD_FONT_INIT); thr->wait_reply_func(thr, CMD_FONT_INIT); diff --git a/menu/disp/xmb.c b/menu/disp/xmb.c index 5aa61c0037..95d2209612 100644 --- a/menu/disp/xmb.c +++ b/menu/disp/xmb.c @@ -873,7 +873,7 @@ static GLuint xmb_png_texture_load(const char* file_name) static bool xmb_font_init_first(const gl_font_renderer_t **font_driver, void **font_handle, void *video_data, const char *font_path, - float font_size) + float xmb_font_size) { if (g_settings.video.threaded && !g_extern.system.hw_render_callback.context_type) @@ -884,7 +884,7 @@ static bool xmb_font_init_first(const gl_font_renderer_t **font_driver, thr->cmd_data.font_init.font_handle = font_handle; thr->cmd_data.font_init.video_data = video_data; thr->cmd_data.font_init.font_path = font_path; - thr->cmd_data.font_init.font_size = font_size; + thr->cmd_data.font_init.font_size = xmb_font_size; thr->send_cmd_func(thr, CMD_FONT_INIT); thr->wait_reply_func(thr, CMD_FONT_INIT);