From 80a6673004679b37255d1df76f9d199f0379c9ed Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 16 Mar 2015 16:57:27 +0100
Subject: [PATCH] Fix some CXX_BUILD errors

---
 input/drivers/linuxraw_input.c | 2 +-
 menu/drivers/glui.c            | 3 ++-
 menu/drivers/rgui.c            | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c
index 0046da8b8a..0956becf5a 100644
--- a/input/drivers/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@@ -217,7 +217,7 @@ static const rarch_joypad_driver_t *linuxraw_get_joypad_driver(void *data)
 {
    linuxraw_input_t *linuxraw = (linuxraw_input_t*)data;
    if (!linuxraw)
-      return false;
+      return NULL;
    return linuxraw->joypad;
 }
 
diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 44cbaaadbc..2d7598f979 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -219,6 +219,7 @@ static void glui_get_message(const char *message)
 static void glui_render_messagebox(const char *message)
 {
    unsigned i;
+   uint32_t normal_color;
    int x, y;
    struct string_list *list = NULL;
    glui_handle_t *glui = NULL;
@@ -249,7 +250,7 @@ static void glui_render_messagebox(const char *message)
    x = gl->win_width  / 2 - strlen(list->elems[0].data) * glui->glyph_width / 2;
    y = gl->win_height / 2 - list->size * glui->line_height / 2;
 
-   const uint32_t normal_color = FONT_COLOR_ARGB_TO_RGBA(g_settings.menu.entry_normal_color);
+   normal_color = FONT_COLOR_ARGB_TO_RGBA(g_settings.menu.entry_normal_color);
 
    for (i = 0; i < list->size; i++)
    {
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 50638f1013..a2bb8fa091 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -270,6 +270,7 @@ static void rgui_render_messagebox(const char *message)
    size_t i;
    int x, y;
    unsigned width, glyphs_width, height;
+   uint16_t color;
    struct string_list *list = NULL;
    menu_handle_t *menu = menu_driver_resolve();
 
@@ -317,7 +318,7 @@ static void rgui_render_messagebox(const char *message)
    fill_rect(&menu->frame_buf, x + 5, y + height - 5, width - 5, 5, green_filler);
    fill_rect(&menu->frame_buf, x, y + 5, 5, height - 5, green_filler);
 
-   uint16_t color = NORMAL_COLOR;
+   color = NORMAL_COLOR;
 
    for (i = 0; i < list->size; i++)
    {
@@ -346,6 +347,7 @@ static void rgui_render(void)
    char title[256], title_buf[256], title_msg[64];
    char timedate[PATH_MAX_LENGTH];
    unsigned x, y, menu_type  = 0;
+   uint16_t hover_color, normal_color;
    const char *dir     = NULL;
    const char *label   = NULL;
    const char *core_name = NULL;
@@ -402,8 +404,8 @@ static void rgui_render(void)
    menu_animation_ticker_line(title_buf, RGUI_TERM_WIDTH - 3,
          g_runloop.frames.video.count / RGUI_TERM_START_X, title, true);
 
-   uint16_t hover_color = HOVER_COLOR;
-   uint16_t normal_color = NORMAL_COLOR;
+   hover_color = HOVER_COLOR;
+   normal_color = NORMAL_COLOR;
 
    blit_line(menu, RGUI_TERM_START_X + RGUI_TERM_START_X, RGUI_TERM_START_X, title_buf, TITLE_COLOR);