From d94e8329e81b6ec5eea4a3877c5664df16cf3010 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 25 Sep 2014 08:12:58 +0200
Subject: [PATCH] Move stuff to config.features.h

---
 config.features.h    | 14 ++++++++++++++
 input/input_common.c |  6 +++---
 retroarch.c          | 14 --------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config.features.h b/config.features.h
index 530b6c1430..ebddc3e9f2 100644
--- a/config.features.h
+++ b/config.features.h
@@ -194,4 +194,18 @@ static const bool _python_supp = true;
 static const bool _python_supp = false;
 #endif
 
+#if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
+#if defined(__HAIKU__)
+#define GLOBAL_CONFIG_DIR "/system/settings"
+#else
+#define GLOBAL_CONFIG_DIR "/etc"
+#endif
+#endif
+
+#ifdef _WIN32
+#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to retroarch.cfg in same directory as retroarch.exe.\n\t\tIf a default config is not found, " RETRO_FRONTEND " will attempt to create one."
+#else
+#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tBy default looks for config in $XDG_CONFIG_HOME/retroarch/retroarch.cfg,\n\t\t$HOME/.config/retroarch/retroarch.cfg,\n\t\tand $HOME/.retroarch.cfg.\n\t\tIf a default config is not found," RETRO_FRONTEND " will attempt to create one based on the skeleton config (" GLOBAL_CONFIG_DIR "/retroarch.cfg)."
+#endif
+
 #endif
diff --git a/input/input_common.c b/input/input_common.c
index 0bcd257c5a..64f39028ed 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -1616,12 +1616,12 @@ retro_input_t input_keys_pressed(unsigned key,
       unsigned key_end, const struct retro_keybind **binds)
 {
    retro_input_t ret = 0;
+   
+   if (driver.block_libretro_input)
+      return 0;
 
    for (; key < key_end; key++)
    {
-      if (driver.block_libretro_input)
-         return 0;
-
       ret |= driver.input->input_state(driver.input_data,
             binds, 0, RETRO_DEVICE_JOYPAD, 0, key) ? (1ULL << key) : 0;
 #ifdef HAVE_OVERLAY
diff --git a/retroarch.c b/retroarch.c
index 181ab229af..c30519df1c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -538,20 +538,6 @@ bool rarch_audio_flush(const int16_t *data, size_t samples)
    return true;
 }
 
-#if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
-#if defined(__HAIKU__)
-#define GLOBAL_CONFIG_DIR "/system/settings"
-#else
-#define GLOBAL_CONFIG_DIR "/etc"
-#endif
-#endif
-
-#ifdef _WIN32
-#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to retroarch.cfg in same directory as retroarch.exe.\n\t\tIf a default config is not found, " RETRO_FRONTEND " will attempt to create one."
-#else
-#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tBy default looks for config in $XDG_CONFIG_HOME/retroarch/retroarch.cfg,\n\t\t$HOME/.config/retroarch/retroarch.cfg,\n\t\tand $HOME/.retroarch.cfg.\n\t\tIf a default config is not found," RETRO_FRONTEND " will attempt to create one based on the skeleton config (" GLOBAL_CONFIG_DIR "/retroarch.cfg)."
-#endif
-
 #include "config.features.h"
 
 #define _PSUPP(var, name, desc) printf("\t%s:\n\t\t%s: %s\n", name, desc, _##var##_supp ? "yes" : "no")