From b0d5555a064dedf00c1a6605f8f501fc25978641 Mon Sep 17 00:00:00 2001
From: Antony Riakiotakis <kalast@gmail.com>
Date: Sat, 8 Jun 2013 21:48:01 +0000
Subject: Fix compilation of cycles for MinGW-w64 after recent commits.
 MinGW-w64 has conflicting redefinitions of the SSE functions in windows.h, so
 we will be using this header instead, since we can't always avoid including
 it instead of the sse headers.

---
 intern/cycles/util/util_types.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index 0bc67f0618a..472a707d8fd 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -80,8 +80,14 @@
 
 #ifdef __x86_64__
 
+/* MinGW64 has conflicting declarations for these SSE headers in <windows.h>.
+ * Since we can't avoid including <windows.h>, better only include that */
+#ifdef FREE_WINDOWS64
+#include <windows.h>
+#else
 #include <xmmintrin.h> /* SSE 1 */
 #include <emmintrin.h> /* SSE 2 */
+#endif
 
 #define __KERNEL_SSE2__
 
-- 
cgit v1.2.3