From bf8cec3d044eca18b0465092e5ec7bb10bc1f021 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 21 Oct 2014 08:02:40 +0200
Subject: [PATCH] (MSVC) Build fixes

---
 compat/rxml/rxml.c                         | 2 +-
 general.h                                  | 4 ++--
 gfx/d3d/d3d.cpp                            | 2 +-
 griffin/griffin.c                          | 2 +-
 libretro-sdk/compat/compat.c               | 2 +-
 libretro-sdk/include/compat/posix_string.h | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compat/rxml/rxml.c b/compat/rxml/rxml.c
index d1105e4cef..a1ccc1582d 100644
--- a/compat/rxml/rxml.c
+++ b/compat/rxml/rxml.c
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <stdint.h>
 #include <boolean.h>
-#include "../posix_string.h"
+#include <compat/posix_string.h>
 
 #ifndef RXML_TEST
 #include "../../general.h"
diff --git a/general.h b/general.h
index 87396de28b..42c27f10ed 100644
--- a/general.h
+++ b/general.h
@@ -29,7 +29,7 @@
 #include "dynamic.h"
 #include "cheats.h"
 #include "audio/dsp_filter.h"
-#include "compat/strl.h"
+#include <compat/strl.h>
 #include "core_options.h"
 #include "core_info.h"
 #include "miscellaneous.h"
@@ -60,7 +60,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
-#include "compat/msvc_compat.h"
+#include <compat/posix_string.h>
 #endif
 
 /* Wii and PSL1GHT - for usleep (among others) */
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 87bb2e9b62..b16411d673 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -34,7 +34,7 @@
 #define HAVE_WINDOW
 #endif
 
-#include "../../compat/posix_string.h"
+#include <compat/posix_string.h>
 #include "../../performance.h"
 
 #if defined(HAVE_CG)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 7be1394de2..d6c1f48c4c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -23,7 +23,7 @@
 #endif
 
 #if defined(_MSC_VER)
-#include "../compat/msvc_compat.h"
+#include <compat/posix_string.h>
 #endif
 
 /*============================================================
diff --git a/libretro-sdk/compat/compat.c b/libretro-sdk/compat/compat.c
index fd643721a4..10f3bf78b3 100644
--- a/libretro-sdk/compat/compat.c
+++ b/libretro-sdk/compat/compat.c
@@ -292,7 +292,7 @@ size_t strlcat(char *dest, const char *source, size_t size)
 #include <ctype.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include "strl.h"
+#include <compat/strl.h>
 
 #include <string.h>
 
diff --git a/libretro-sdk/include/compat/posix_string.h b/libretro-sdk/include/compat/posix_string.h
index c49879cdef..68126e0db7 100644
--- a/libretro-sdk/include/compat/posix_string.h
+++ b/libretro-sdk/include/compat/posix_string.h
@@ -25,7 +25,7 @@
 
 #ifdef _WIN32
 
-#include "msvc_compat.h"
+#include <compat/msvc.h>
 
 #ifdef __cplusplus
 extern "C" {