From 3ca4ac2a21ec4045597ee27a6467a43c07d492c9 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 25 Nov 2018 19:22:55 +0100 Subject: [PATCH] (Ozone) Fix redefinition of typedef --- menu/drivers/ozone/ozone.h | 6 +++--- menu/drivers/ozone/ozone_theme.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/menu/drivers/ozone/ozone.h b/menu/drivers/ozone/ozone.h index 5438714485..76912544b9 100644 --- a/menu/drivers/ozone/ozone.h +++ b/menu/drivers/ozone/ozone.h @@ -42,7 +42,7 @@ typedef struct ozone_handle ozone_handle_t; #define INTERVAL_BATTERY_LEVEL_CHECK (30 * 1000000) #define INTERVAL_OSK_CURSOR (0.5f * 1000000) -typedef struct ozone_handle +struct ozone_handle { uint64_t frame_count; @@ -152,7 +152,7 @@ typedef struct ozone_handle unsigned old_list_offset_y; file_list_t *horizontal_list; /* console tabs */ -} ozone_handle_t; +}; /* If you change this struct, also change ozone_alloc_node and @@ -207,4 +207,4 @@ void ozone_free_list_nodes(file_list_t *list, bool actiondata); bool ozone_is_playlist(ozone_handle_t *ozone); -#endif \ No newline at end of file +#endif diff --git a/menu/drivers/ozone/ozone_theme.c b/menu/drivers/ozone/ozone_theme.c index fa9478fa82..5a32bd4943 100644 --- a/menu/drivers/ozone/ozone_theme.c +++ b/menu/drivers/ozone/ozone_theme.c @@ -118,10 +118,10 @@ void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme) last_color_theme = color_theme; } -unsigned ozone_get_system_theme() +unsigned ozone_get_system_theme(void) { - unsigned ret = 0; #ifdef HAVE_LIBNX + unsigned ret = 0; if (R_SUCCEEDED(setsysInitialize())) { ColorSetId theme; @@ -133,4 +133,4 @@ unsigned ozone_get_system_theme() return ret; #endif return 0; -} \ No newline at end of file +}