From 7b48a0c57ea6623d2575d27d7eaae8a3fe740d7a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 21 Mar 2016 21:18:25 +0100
Subject: [PATCH] (XMB) Prevent symbol collission

---
 menu/drivers/xmb.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 8cf61bc551..704be49b35 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -227,7 +227,7 @@ typedef struct xmb_handle
    gfx_font_raster_block_t raster_block;
 } xmb_handle_t;
 
-static char* xmb_theme()
+static char* xmb_theme_ident(void)
 {
    settings_t *settings = config_get_ptr();
    switch (settings->menu.xmb_theme)
@@ -239,8 +239,10 @@ static char* xmb_theme()
       case 2:
          return "custom";
       default:
-         return "monochrome";
+         break;
    }
+
+   return "monochrome";
 }
 
 static void xmb_fill_default_background_path(xmb_handle_t *xmb,
@@ -255,7 +257,7 @@ static void xmb_fill_default_background_path(xmb_handle_t *xmb,
 
     fill_pathname_join(mediapath, settings->assets_directory,
                        "xmb", sizeof(mediapath));
-    fill_pathname_join(themepath, mediapath, xmb_theme(), sizeof(themepath));
+    fill_pathname_join(themepath, mediapath, xmb_theme_ident(), sizeof(themepath));
     fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath));
     fill_pathname_slash(iconpath, sizeof(iconpath));
 
@@ -1277,7 +1279,7 @@ static void xmb_refresh_horizontal_list(xmb_handle_t *xmb)
 
    fill_pathname_join(mediapath, settings->assets_directory,
          "xmb", sizeof(mediapath));
-   fill_pathname_join(themepath, mediapath, xmb_theme(), sizeof(themepath));
+   fill_pathname_join(themepath, mediapath, xmb_theme_ident(), sizeof(themepath));
 
    xmb_context_destroy_horizontal_list(xmb);
    if (xmb->horizontal_list)
@@ -2074,7 +2076,7 @@ static void xmb_font(xmb_handle_t *xmb)
    fill_pathname_join(mediapath,
          settings->assets_directory, "xmb", sizeof(mediapath));
    fill_pathname_join(themepath,
-         mediapath, xmb_theme(), sizeof(themepath));
+         mediapath, xmb_theme_ident(), sizeof(themepath));
    if (string_is_empty(settings->menu.xmb_font))
          fill_pathname_join(fontpath, themepath, "font.ttf", sizeof(fontpath));
    else
@@ -2496,7 +2498,7 @@ static void xmb_context_reset(void *data)
 
    fill_pathname_join(mediapath, settings->assets_directory,
          "xmb", sizeof(mediapath));
-   fill_pathname_join(themepath, mediapath, xmb_theme(), sizeof(themepath));
+   fill_pathname_join(themepath, mediapath, xmb_theme_ident(), sizeof(themepath));
    fill_pathname_join(iconpath, themepath, xmb->icon.dir, sizeof(iconpath));
    fill_pathname_slash(iconpath, sizeof(iconpath));