From eea4866ec9af301985d3eb2f648b8c95661fae2f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 16 Jul 2015 02:46:59 +0200
Subject: Fix build for Windows/MingW64 (32bit target)

---
 LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp | 6 ++++++
 LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp       | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp b/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp
index 22a0b4a..2bb1ff8 100644
--- a/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp
+++ b/LibOVR/Src/Service/Service_Win32_FastIPC_Client.cpp
@@ -26,6 +26,12 @@ limitations under the License.
 
 #include "Service_Win32_FastIPC_Client.h"
 
+#if !defined(OVR_CC_MSVC)
+// mingw64: add definition of MemoryBarrier() and _mm_mfence() .. and the like
+#include <intrin.h>
+#include <winnt.h>
+#endif /* !defined(OVR_CC_MSVC) */
+
 namespace OVR { namespace Service { namespace Win32 {
 
 using namespace OVR::Net;
diff --git a/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp b/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
index 736b734..97fc77c 100644
--- a/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
+++ b/LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
@@ -35,6 +35,12 @@ limitations under the License.
 // For _beginthreadex / _endtheadex
 #include <process.h>
 
+#if !defined(OVR_CC_MSVC)
+// mingw64: add definition of MemoryBarrier() and _mm_mfence() .. and the like
+#include <intrin.h>
+#include <winnt.h>
+#endif /* !defined(OVR_CC_MSVC) */
+
 namespace OVR {
 
 
@@ -1148,4 +1154,4 @@ ThreadId GetCurrentThreadId()
 
 } // OVR
 
-#endif
+#endif /* OVR_ENABLE_THREADS */
-- 
cgit v1.2.3