From 4e5314b6bb42d8a27eb7e630a50ae40df9e4b75a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 20:29:01 +0100 Subject: [PATCH] Rename input_context.c to input_joypad_driver.c --- Makefile.common | 2 +- griffin/griffin.c | 2 +- input/drivers_joypad/nullinput_joypad.c | 2 +- input/input_driver.h | 2 +- input/{input_context.c => input_joypad_driver.c} | 2 +- input/{input_context.h => input_joypad_driver.h} | 4 ++-- input/keyboard_event_xkb.c | 2 +- tools/retroarch-joyconfig-griffin.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename input/{input_context.c => input_joypad_driver.c} (99%) rename input/{input_context.h => input_joypad_driver.h} (98%) diff --git a/Makefile.common b/Makefile.common index 83446d48fc..64c8c2ad52 100644 --- a/Makefile.common +++ b/Makefile.common @@ -115,7 +115,7 @@ OBJ += frontend/frontend.o \ gfx/gfx_common.o \ gfx/fonts/bitmapfont.o \ input/input_autodetect.o \ - input/input_context.o \ + input/input_joypad_driver.o \ input/input_joypad.o \ input/input_common.o \ input/input_keymaps.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index 3bab7799b2..f228aa99ff 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -280,7 +280,7 @@ FONTS INPUT ============================================================ */ #include "../input/input_autodetect.c" -#include "../input/input_context.c" +#include "../input/input_joypad_driver.c" #include "../input/input_joypad.c" #include "../input/input_common.c" #include "../input/input_keymaps.c" diff --git a/input/drivers_joypad/nullinput_joypad.c b/input/drivers_joypad/nullinput_joypad.c index 472c8c000f..2fbd2ac308 100644 --- a/input/drivers_joypad/nullinput_joypad.c +++ b/input/drivers_joypad/nullinput_joypad.c @@ -18,7 +18,7 @@ #include #include #include -#include "../input_context.h" +#include "../input_joypad_driver.h" static const char *null_joypad_name(unsigned pad) { diff --git a/input/input_driver.h b/input/input_driver.h index 5d5fa21cd7..bb7a7b4308 100644 --- a/input/input_driver.h +++ b/input/input_driver.h @@ -23,7 +23,7 @@ #include #include "../libretro.h" -#include "input_context.h" +#include "input_joypad_driver.h" #ifdef HAVE_OVERLAY #include "overlay.h" diff --git a/input/input_context.c b/input/input_joypad_driver.c similarity index 99% rename from input/input_context.c rename to input/input_joypad_driver.c index 08318a359a..423f9de33d 100644 --- a/input/input_context.c +++ b/input/input_joypad_driver.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "input_context.h" +#include "input_joypad_driver.h" #include "input_keymaps.h" #include #include diff --git a/input/input_context.h b/input/input_joypad_driver.h similarity index 98% rename from input/input_context.h rename to input/input_joypad_driver.h index 7d44201eec..bd1223068f 100644 --- a/input/input_context.h +++ b/input/input_joypad_driver.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef INPUT_CONTEXT_H__ -#define INPUT_CONTEXT_H__ +#ifndef INPUT_JOYPAD_DRIVER_H__ +#define INPUT_JOYPAD_DRIVER_H__ #ifdef __cplusplus extern "C" { diff --git a/input/keyboard_event_xkb.c b/input/keyboard_event_xkb.c index 60436ea407..3287c6b85d 100644 --- a/input/keyboard_event_xkb.c +++ b/input/keyboard_event_xkb.c @@ -15,7 +15,7 @@ */ #include -#include "input_context.h" +#include "input_joypad_driver.h" #include "input_keymaps.h" #include "keyboard_line.h" diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c index a55b82ed1e..47ca9ba247 100644 --- a/tools/retroarch-joyconfig-griffin.c +++ b/tools/retroarch-joyconfig-griffin.c @@ -49,7 +49,7 @@ #include "../input/drivers/nullinput.c" #include "../input/drivers_joypad/nullinput_joypad.c" -#include "../input/input_context.c" +#include "../input/input_joypad_driver.c" #include "../input/input_joypad.c" #include "../input/input_common.c" #include "../input/input_keymaps.c"