From 012e069f8697c15777b7fa9f7e0b5c4e61f38d63 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Sep 2016 13:21:56 +0200 Subject: [PATCH] Get rid of general.h includes --- input/drivers/android_input.c | 13 ++++++++----- input/drivers/cocoa_input.c | 5 ++++- input/drivers/cocoa_input.h | 1 - input/drivers/ctr_input.c | 5 ++++- input/drivers/dinput.c | 5 ++++- input/drivers/ps3_input.c | 5 ++++- input/drivers/psp_input.c | 12 ++++++++---- input/drivers/qnx_input.c | 5 ++++- input/drivers/rwebinput_input.c | 2 -- input/drivers/xdk_xinput_input.c | 5 ++++- input/input_joypad_driver.c | 1 - menu/drivers/null.c | 2 -- 12 files changed, 40 insertions(+), 21 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 038f12abd9..449c9bf541 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -25,20 +25,23 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + +#ifdef HAVE_MENU +#include "../../menu/menu_display.h" +#endif + #include "../../frontend/drivers/platform_linux.h" #include "../input_autodetect.h" #include "../input_config.h" #include "../input_joypad_driver.h" #include "../drivers_keyboard/keyboard_event_android.h" #include "../../performance_counters.h" -#include "../../general.h" #include "../../driver.h" #include "../../configuration.h" -#ifdef HAVE_MENU -#include "../../menu/menu_display.h" -#endif - #define MAX_TOUCH 16 #define MAX_NUM_KEYBOARDS 3 diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 8ea60312e8..d3fae1da47 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -17,11 +17,14 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "../input_config.h" #include "../input_joypad_driver.h" #include "../input_keymaps.h" #include "cocoa_input.h" -#include "../../general.h" #include "../../configuration.h" #include "../../driver.h" diff --git a/input/drivers/cocoa_input.h b/input/drivers/cocoa_input.h index 1dd4fd2f66..78a202564f 100644 --- a/input/drivers/cocoa_input.h +++ b/input/drivers/cocoa_input.h @@ -19,7 +19,6 @@ #include #include -#include "../../general.h" /* Input responder */ #define MAX_TOUCHES 16 diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c index b28cd99d10..5bfc906eec 100644 --- a/input/drivers/ctr_input.c +++ b/input/drivers/ctr_input.c @@ -19,9 +19,12 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "../../configuration.h" #include "../../driver.h" -#include "../../general.h" #include "../input_config.h" #include "../input_joypad_driver.h" diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c index a614ce8397..65833d1032 100644 --- a/input/drivers/dinput.c +++ b/input/drivers/dinput.c @@ -38,8 +38,11 @@ #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "../../configuration.h" -#include "../../general.h" #include "../../verbosity.h" #include "../input_autodetect.h" #include "../input_config.h" diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c index e75a5ba4ba..9c4d6a68e5 100644 --- a/input/drivers/ps3_input.c +++ b/input/drivers/ps3_input.c @@ -22,11 +22,14 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "../../defines/ps3_defines.h" #include "../../configuration.h" #include "../../driver.h" -#include "../../general.h" #ifdef HAVE_MOUSE #ifndef __PSL1GHT__ diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index 81ff03c992..408071da38 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -17,6 +17,10 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #if defined(SN_TARGET_PSP2) #include #include @@ -30,15 +34,15 @@ #include #include +#ifdef HAVE_KERNEL_PRX +#include "../../bootstrap/psp1/kernel_functions.h" +#endif + #include "../../defines/psp_defines.h" #include "../../configuration.h" #include "../../driver.h" -#include "../../general.h" #include "../input_config.h" -#ifdef HAVE_KERNEL_PRX -#include "../../bootstrap/psp1/kernel_functions.h" -#endif typedef struct psp_input { diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c index b875358d3f..e1abc42eb0 100644 --- a/input/drivers/qnx_input.c +++ b/input/drivers/qnx_input.c @@ -23,8 +23,11 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "../../configuration.h" -#include "../../general.h" #include "../../driver.h" #include "../input_autodetect.h" diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index 3a704a3597..096c83cb37 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -26,8 +26,6 @@ #include "../../configuration.h" #include "../../driver.h" -#include "../../general.h" - typedef struct rwebinput_state { uint8_t keys[32]; diff --git a/input/drivers/xdk_xinput_input.c b/input/drivers/xdk_xinput_input.c index 5de4c112fa..577061def2 100644 --- a/input/drivers/xdk_xinput_input.c +++ b/input/drivers/xdk_xinput_input.c @@ -17,6 +17,10 @@ #include #include +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #ifdef _XBOX #include #endif @@ -26,7 +30,6 @@ #include "../../configuration.h" #include "../../driver.h" -#include "../../general.h" #define MAX_PADS 4 diff --git a/input/input_joypad_driver.c b/input/input_joypad_driver.c index 2434668009..ec45cf0aad 100644 --- a/input/input_joypad_driver.c +++ b/input/input_joypad_driver.c @@ -26,7 +26,6 @@ #include "input_keymaps.h" #include "../configuration.h" -#include "../general.h" #include "../list_special.h" #include "../verbosity.h" diff --git a/menu/drivers/null.c b/menu/drivers/null.c index 921bb12f50..e74ccc1af0 100644 --- a/menu/drivers/null.c +++ b/menu/drivers/null.c @@ -23,8 +23,6 @@ #include "../menu_driver.h" #include "../menu_display.h" -#include "../../general.h" - menu_ctx_driver_t menu_ctx_null = { NULL, /* set_texture */ NULL, /* render_messagebox */