From c8f4d978399f5d29b020d43d10dca7f16db4aef6 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 21 Mar 2016 18:49:50 +0100
Subject: [PATCH] Move config_file_userdata outside libretro-common

---
 Makefile.common                                               | 2 +-
 audio/audio_dsp_filter.c                                      | 2 +-
 audio/audio_resampler_driver.c                                | 2 +-
 .../file/config_file_userdata.c => config_file_userdata.c     | 3 ++-
 .../file/config_file_userdata.h => config_file_userdata.h     | 4 ++--
 gfx/video_filter.c                                            | 2 +-
 griffin/griffin.c                                             | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)
 rename libretro-common/file/config_file_userdata.c => config_file_userdata.c (99%)
 rename libretro-common/include/file/config_file_userdata.h => config_file_userdata.h (96%)

diff --git a/Makefile.common b/Makefile.common
index ba14754393..d372e25591 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -172,7 +172,7 @@ OBJ += frontend/frontend.o \
        cheats.o \
        core_info.o \
        libretro-common/file/config_file.o \
-       libretro-common/file/config_file_userdata.o \
+       config_file_userdata.o \
        screenshot.o \
        libretro-common/gfx/scaler/scaler.o \
        gfx/drivers_shader/shader_null.o \
diff --git a/audio/audio_dsp_filter.c b/audio/audio_dsp_filter.c
index 1fbeb1a5e4..6c68911dad 100644
--- a/audio/audio_dsp_filter.c
+++ b/audio/audio_dsp_filter.c
@@ -22,12 +22,12 @@
 #include <dynamic/dylib.h>
 
 #include <file/file_path.h>
-#include <file/config_file_userdata.h>
 #include <lists/dir_list.h>
 
 #include "audio_dsp_filter.h"
 #include "audio_filters/dspfilter.h"
 
+#include "../config_file_userdata.h"
 #include "../frontend/frontend_driver.h"
 #include "../performance.h"
 #include "../dynamic.h"
diff --git a/audio/audio_resampler_driver.c b/audio/audio_resampler_driver.c
index 286be5bae1..44855d962d 100644
--- a/audio/audio_resampler_driver.c
+++ b/audio/audio_resampler_driver.c
@@ -16,10 +16,10 @@
 
 #include <string.h>
 
-#include <file/config_file_userdata.h>
 #include <string/stdstring.h>
 
 #include "audio_resampler_driver.h"
+#include "../config_file_userdata.h"
 #ifdef RARCH_INTERNAL
 #include "../performance.h"
 #endif
diff --git a/libretro-common/file/config_file_userdata.c b/config_file_userdata.c
similarity index 99%
rename from libretro-common/file/config_file_userdata.c
rename to config_file_userdata.c
index e9cf8ec567..5a722c7235 100644
--- a/libretro-common/file/config_file_userdata.c
+++ b/config_file_userdata.c
@@ -20,10 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <file/config_file_userdata.h>
 #include <file/file_path.h>
 #include <lists/string_list.h>
 
+#include "config_file_userdata.h"
+
 #define get_array_setup() \
    char key[2][256]; \
    bool got; \
diff --git a/libretro-common/include/file/config_file_userdata.h b/config_file_userdata.h
similarity index 96%
rename from libretro-common/include/file/config_file_userdata.h
rename to config_file_userdata.h
index 1add87ef49..19d2277192 100644
--- a/libretro-common/include/file/config_file_userdata.h
+++ b/config_file_userdata.h
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (config_file_userdata.h).
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "config_file.h"
+#include <file/config_file.h>
 
 struct config_file_userdata
 {
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index aef309c3b0..aa263d7a48 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -16,12 +16,12 @@
 
 #include <stdlib.h>
 
-#include <file/config_file_userdata.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <dynamic/dylib.h>
 
 #include "../frontend/frontend_driver.h"
+#include "../config_file_userdata.h"
 #include "../dynamic.h"
 #include "../general.h"
 #include "../performance.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 85951b9c92..85ff5f5176 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -100,7 +100,7 @@ CONFIG FILE
 #endif
 
 #include "../libretro-common/file/config_file.c"
-#include "../libretro-common/file/config_file_userdata.c"
+#include "../config_file_userdata.c"
 #include "../core_options.c"
 
 /*============================================================