From 9fd17a196f4b53dee18339c3dd4e86ba3bf93d01 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 20 Aug 2015 00:49:44 +0200
Subject: [PATCH] Buildfixes

---
 dynamic.c                       | 2 +-
 input/drivers/rwebinput_input.c | 9 +++++----
 menu/cbs/menu_cbs_ok.c          | 3 ++-
 menu/menu_displaylist.c         | 5 +++--
 menu/menu_setting.c             | 2 ++
 retroarch.c                     | 2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dynamic.c b/dynamic.c
index 98d910ca31..657240d5d1 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -752,7 +752,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
          break;
 
       case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY:
-         if (settings->system_directory[0] == '\0' || settings->system_directory[0] == '\0')
+         if (settings->system_directory[0] == '\0')
          {
             RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",global->path.fullpath);
             fill_pathname_basedir(buf, global->path.fullpath,
diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c
index a0579c6fe2..aecb612c02 100644
--- a/input/drivers/rwebinput_input.c
+++ b/input/drivers/rwebinput_input.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <boolean.h>
 
+#include "../input_joypad.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
 #include "../input_keymaps.h"
@@ -68,7 +69,7 @@ error:
    return NULL;
 }
 
-static bool rwebinput_key_pressed(void *data, int key)
+static bool rwebinput_key_pressed__(void *data, int key)
 {
    unsigned sym;
    bool ret;
@@ -96,7 +97,7 @@ static bool rwebinput_is_pressed(rwebinput_input_t *rwebinput,
    if (id < RARCH_BIND_LIST_END)
    {
       const struct retro_keybind *bind = &binds[id];
-      return bind->valid && rwebinput_key_pressed(rwebinput, binds[id].key);
+      return bind->valid && rwebinput_key_pressed__(rwebinput, binds[id].key);
    }
 
    return false;
@@ -242,7 +243,7 @@ static bool rwebinput_keyboard_mapping_is_blocked(void *data)
    rwebinput_input_t *rwebinput = (rwebinput_input_t*)data;
    if (!rwebinput)
       return false;
-   return rwebinput->blocked;
+   return rwebinput->state.blocked;
 }
 
 static void rwebinput_keyboard_mapping_set_block(void *data, bool value)
@@ -250,7 +251,7 @@ static void rwebinput_keyboard_mapping_set_block(void *data, bool value)
    rwebinput_input_t *rwebinput = (rwebinput_input_t*)data;
    if (!rwebinput)
       return;
-   rwebinput->blocked = value;
+   rwebinput->state.blocked = value;
 }
 
 input_driver_t input_rwebinput = {
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index d2b3d6145b..4b53d97061 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1056,13 +1056,14 @@ static int action_ok_core_load(const char *path,
       return -1;
    }
 
-   return 0;
    /* Core selection on non-console just updates directory listing.
     * Will take effect on new content load. */
 #elif defined(RARCH_CONSOLE)
    event_command(EVENT_CMD_RESTART_RETROARCH);
    return -1;
 #endif
+
+   return 0;
 }
 
 static int action_ok_core_download(const char *path,
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 24a487f6ce..ae2c66a53c 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -42,10 +42,11 @@
 #include "../frontend/drivers/platform_android.h"
 #endif
 
+extern unsigned rpl_entry_selection_ptr;
+
 #ifdef HAVE_NETWORKING
 extern char *core_buf;
 extern size_t core_len;
-extern unsigned rpl_entry_selection_ptr;
 
 static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
       unsigned type)
@@ -1790,7 +1791,7 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in
    menu_handle_t *menu    = menu_driver_get_ptr();
    global_t *global       = global_get_ptr();
    settings_t *settings   = config_get_ptr();
-   unsigned idx = rpl_entry_selection_ptr;
+   unsigned idx                    = rpl_entry_selection_ptr;
    const char *label               = NULL;
    const char *core_path           = NULL;
    const char *core_name           = NULL;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index d72976e0de..7a61041b98 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -1352,6 +1352,7 @@ static void setting_get_string_representation_uint_analog_dpad_mode(void *data,
             len);
 }
 
+#ifdef HAVE_THREADS
 static void setting_get_string_representation_uint_autosave_interval(void *data,
       char *s, size_t len)
 {
@@ -1365,6 +1366,7 @@ static void setting_get_string_representation_uint_autosave_interval(void *data,
    else
       strlcpy(s, menu_hash_to_str(MENU_VALUE_OFF), len);
 }
+#endif
 
 static void setting_get_string_representation_uint_user_language(void *data,
       char *s, size_t len)
diff --git a/retroarch.c b/retroarch.c
index c307e1c8e0..f6afcc735b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -313,7 +313,7 @@ static void set_special_paths(char **argv, unsigned num_content)
    /* If this is already set,
     * do not overwrite it as this was initialized before in
     * a menu or otherwise. */
-   if (!settings->system_directory || settings->system_directory[0] == '\0')
+   if (settings->system_directory[0] == '\0')
    {
       RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",argv[0]);
       /*fill_pathname_basedir(settings->system_directory, argv[0],