From 480cd7c7ba049d0133c04a982cc11279a1fe7f73 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 21 Oct 2014 06:06:12 +0200 Subject: [PATCH] Move msvc_compat.h to compat/ dir --- audio/resamplers/sinc.c | 2 +- audio/xaudio-c/xaudio-c.cpp | 2 +- compat/compat.c | 2 +- {msvc => compat}/msvc_compat.h | 0 compat/posix_string.h | 2 +- conf/config_file.c | 2 +- dir_list.c | 2 +- driver.h | 2 +- file_list.c | 2 +- file_path.c | 1 - general.h | 2 +- gfx/fonts/bitmapfont.c | 2 +- gfx/shader/shader_parse.c | 2 +- griffin/griffin.c | 2 +- hash.h | 2 +- logger/xdk1_logger_override.h | 2 +- miscellaneous.h | 2 +- patch.c | 2 +- playlist.c | 1 - record/ffmpeg.c | 2 +- retroarch.c | 1 - 21 files changed, 17 insertions(+), 20 deletions(-) rename {msvc => compat}/msvc_compat.h (100%) diff --git a/audio/resamplers/sinc.c b/audio/resamplers/sinc.c index 72a7e5dabf..24b0351168 100644 --- a/audio/resamplers/sinc.c +++ b/audio/resamplers/sinc.c @@ -25,7 +25,7 @@ #include #include #ifdef _WIN32 -#include "../../msvc/msvc_compat.h" +#include "../../compat/msvc_compat.h" #endif #if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL) diff --git a/audio/xaudio-c/xaudio-c.cpp b/audio/xaudio-c/xaudio-c.cpp index 8df369d517..b899a90783 100644 --- a/audio/xaudio-c/xaudio-c.cpp +++ b/audio/xaudio-c/xaudio-c.cpp @@ -20,7 +20,7 @@ #include "xaudio-c.h" #include #include -#include "../../msvc/msvc_compat.h" +#include "../../compat/msvc_compat.h" #include #define MAX_BUFFERS 16 diff --git a/compat/compat.c b/compat/compat.c index a8952c1722..ae7ffa1523 100644 --- a/compat/compat.c +++ b/compat/compat.c @@ -26,7 +26,7 @@ #include #include #ifdef _MSC_VER -#include "../msvc/msvc_compat.h" +#include "msvc_compat.h" #endif char *optarg; diff --git a/msvc/msvc_compat.h b/compat/msvc_compat.h similarity index 100% rename from msvc/msvc_compat.h rename to compat/msvc_compat.h diff --git a/compat/posix_string.h b/compat/posix_string.h index 3bc9ca5cf6..76604e4eba 100644 --- a/compat/posix_string.h +++ b/compat/posix_string.h @@ -18,7 +18,7 @@ #ifdef _WIN32 -#include "../msvc/msvc_compat.h" +#include "msvc_compat.h" #ifdef __cplusplus extern "C" { diff --git a/conf/config_file.c b/conf/config_file.c index 56e7ce5cc7..8f801c4919 100644 --- a/conf/config_file.c +++ b/conf/config_file.c @@ -21,7 +21,7 @@ #include #include "../compat/strl.h" #include "../compat/posix_string.h" -#include "../msvc/msvc_compat.h" +#include "../compat/msvc_compat.h" #include "../file.h" #include "../file_path.h" #include "../general.h" diff --git a/dir_list.c b/dir_list.c index 80037756f0..955c59f9b6 100644 --- a/dir_list.c +++ b/dir_list.c @@ -22,7 +22,7 @@ #ifdef _MSC_VER #define setmode _setmode #endif -#include "msvc/msvc_compat.h" +#include "compat/msvc_compat.h" #ifdef _XBOX #include #define INVALID_FILE_ATTRIBUTES -1 diff --git a/driver.h b/driver.h index 6b81e48902..a93d1b1b1c 100644 --- a/driver.h +++ b/driver.h @@ -23,7 +23,7 @@ #include "libretro_private.h" #include #include -#include "msvc/msvc_compat.h" +#include "compat/msvc_compat.h" #include "gfx/scaler/scaler.h" #include "gfx/image/image.h" #include "gfx/filters/softfilter.h" diff --git a/file_list.c b/file_list.c index 1f1fd80ee2..90cefe3b40 100644 --- a/file_list.c +++ b/file_list.c @@ -18,7 +18,7 @@ #include #include "file_list.h" #include "compat/strcasestr.h" -#include "msvc/msvc_compat.h" +#include "compat/msvc_compat.h" void file_list_push(file_list_t *list, const char *path, const char *label, diff --git a/file_path.c b/file_path.c index d7014945a9..45ffb49b7a 100644 --- a/file_path.c +++ b/file_path.c @@ -44,7 +44,6 @@ #ifdef _MSC_VER #define setmode _setmode #endif -#include "msvc/msvc_compat.h" #ifdef _XBOX #include #define INVALID_FILE_ATTRIBUTES -1 diff --git a/general.h b/general.h index 874d898471..87396de28b 100644 --- a/general.h +++ b/general.h @@ -60,7 +60,7 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "msvc/msvc_compat.h" +#include "compat/msvc_compat.h" #endif /* Wii and PSL1GHT - for usleep (among others) */ diff --git a/gfx/fonts/bitmapfont.c b/gfx/fonts/bitmapfont.c index b4896ca471..eaa6f77da7 100644 --- a/gfx/fonts/bitmapfont.c +++ b/gfx/fonts/bitmapfont.c @@ -18,7 +18,7 @@ #include #include #include -#include "../../msvc/msvc_compat.h" +#include "../../compat/msvc_compat.h" #include #define ATLAS_COLS 16 diff --git a/gfx/shader/shader_parse.c b/gfx/shader/shader_parse.c index 9ab0f08482..97a4896d9c 100644 --- a/gfx/shader/shader_parse.c +++ b/gfx/shader/shader_parse.c @@ -17,7 +17,7 @@ #include #include "shader_parse.h" #include "../../compat/posix_string.h" -#include "../../msvc/msvc_compat.h" +#include "../../compat/msvc_compat.h" #include "../../file.h" #include "../../file_path.h" #include "../../compat/strl.h" diff --git a/griffin/griffin.c b/griffin/griffin.c index d5643561c8..865a910bc6 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -23,7 +23,7 @@ #endif #if defined(_MSC_VER) -#include "../msvc/msvc_compat.h" +#include "../compat/msvc_compat.h" #endif /*============================================================ diff --git a/hash.h b/hash.h index 26572b2dd5..dba2f7a5cc 100644 --- a/hash.h +++ b/hash.h @@ -43,7 +43,7 @@ #include #include -#include "msvc/msvc_compat.h" +#include "compat/msvc_compat.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/logger/xdk1_logger_override.h b/logger/xdk1_logger_override.h index c45558d560..ff551c56d4 100644 --- a/logger/xdk1_logger_override.h +++ b/logger/xdk1_logger_override.h @@ -22,7 +22,7 @@ #endif #include -#include "msvc/msvc_compat.h" +#include "../compat/msvc_compat.h" // FIXME: Using arbitrary string as fmt argument is unsafe. static inline void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap) diff --git a/miscellaneous.h b/miscellaneous.h index eb9c2ab330..cb8e164ac3 100644 --- a/miscellaneous.h +++ b/miscellaneous.h @@ -35,7 +35,7 @@ #elif defined(_WIN32) && defined(_XBOX) #include #endif -#include "msvc/msvc_compat.h" +#include "compat/msvc_compat.h" #include "retroarch_logger.h" #include "endianness.h" diff --git a/patch.c b/patch.c index 87d295213b..6f276841cf 100644 --- a/patch.c +++ b/patch.c @@ -19,7 +19,7 @@ #include "patch.h" #include "hash.h" #include -#include "msvc/msvc_compat.h" +#include "compat/msvc_compat.h" #include #include diff --git a/playlist.c b/playlist.c index de44be0bda..a93c949d93 100644 --- a/playlist.c +++ b/playlist.c @@ -16,7 +16,6 @@ */ #include "playlist.h" -#include "msvc/msvc_compat.h" #include "compat/posix_string.h" #include "boolean.h" #include "file.h" diff --git a/record/ffmpeg.c b/record/ffmpeg.c index 6e6c6a25c9..45c31aeb50 100644 --- a/record/ffmpeg.c +++ b/record/ffmpeg.c @@ -13,7 +13,7 @@ * If not, see . */ -#include "../msvc/msvc_compat.h" +#include "../compat/msvc_compat.h" #ifdef HAVE_CONFIG_H #include "../config.h" diff --git a/retroarch.c b/retroarch.c index 598d5dff24..df93d95eb5 100644 --- a/retroarch.c +++ b/retroarch.c @@ -56,7 +56,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "msvc/msvc_compat.h" #endif static bool take_screenshot_viewport(void)