From 195a6aadb20532fb14caf18c9cb07ed738a55271 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 6 Sep 2014 00:47:54 -0400 Subject: [PATCH 1/3] nulllocation: Remove nulllocation_t. This is technically not even allowed according to the C standard, but is a GNU-specific extension --- location/nulllocation.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/location/nulllocation.c b/location/nulllocation.c index 36809a7450..715b3f59d8 100644 --- a/location/nulllocation.c +++ b/location/nulllocation.c @@ -16,10 +16,6 @@ #include "../driver.h" -typedef struct null_location -{ -} nulllocation_t; - static void *null_location_init(void) { return NULL; From 0ddea1e970f81a6adfc98cbaaf776de0e1c58b79 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 6 Sep 2014 01:05:22 -0400 Subject: [PATCH 2/3] Remove some redundant casts on OSX --- apple/common/RAGameView.m | 2 +- apple/common/apple_gfx_context.c.inl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m index e5cd8eb82d..6b24f09cb3 100644 --- a/apple/common/RAGameView.m +++ b/apple/common/RAGameView.m @@ -56,7 +56,7 @@ @implementation NSScreen (IOSCompat) - (CGRect)bounds { - CGRect cgrect = (CGRect)NSRectToCGRect(self.frame); + CGRect cgrect = NSRectToCGRect(self.frame); return CGRectMake(0, 0, CGRectGetWidth(cgrect), CGRectGetHeight(cgrect)); } - (float) scale { return 1.0f; } diff --git a/apple/common/apple_gfx_context.c.inl b/apple/common/apple_gfx_context.c.inl index 18105feb6d..4fb3b67243 100644 --- a/apple/common/apple_gfx_context.c.inl +++ b/apple/common/apple_gfx_context.c.inl @@ -135,7 +135,7 @@ static void apple_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned* if (gl) { #if defined(OSX) - CGRect cgrect = (CGRect)NSRectToCGRect([g_view frame]); + CGRect cgrect = NSRectToCGRect([g_view frame]); size = CGRectMake(0, 0, CGRectGetWidth(cgrect), CGRectGetHeight(cgrect)); #else size = g_view.bounds; From 1f396357ffdfdd484052d6566de739f920cd625b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Flor=C3=A9al=20Toumikian?= Date: Sat, 6 Sep 2014 15:05:50 +0200 Subject: [PATCH 3/3] Fixed Lakka menu --- frontend/menu/disp/lakka.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index d180cc19b2..858e153b38 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -1045,8 +1045,17 @@ static void lakka_init_core_info(void *data) { (void)data; - if (g_extern.core_info) + core_info_list_free(g_extern.core_info); + g_extern.core_info = NULL; + if (*g_settings.libretro_directory) { + g_extern.core_info = core_info_list_new(g_settings.libretro_directory); + } + + if (g_extern.core_info) { num_categories = g_extern.core_info->count + 1; + } else { + num_categories = 1; + } } static void *lakka_init(void)