Fix compilation of cycles for MinGW-w64 after recent commits. MinGW-w64 has conflicti...
authorAntony Riakiotakis <kalast@gmail.com>
Sat, 8 Jun 2013 21:48:01 +0000 (21:48 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Sat, 8 Jun 2013 21:48:01 +0000 (21:48 +0000)
intern/cycles/util/util_types.h

index 0bc67f0618a4d1f498c061bb76b879bc06a325e3..472a707d8fd752f39f3beac479bce52ee397696a 100644 (file)
 
 #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__