[Bf-blender-cvs] [9073a81] master: Fix compilation in cycles

[Antony Riakiotakis]

Commit: 9073a81bceaa9142c562bb5beecc453fbe92f73e
Author: Antony Riakiotakis
Date:   Sat Jun 14 13:54:11 2014 +0300
https://developer.blender.org/rB9073a81bceaa9142c562bb5beecc453fbe92f73e

Fix compilation in cycles

===================================================================

M	intern/cycles/util/util_simd.h

===================================================================

diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index 0f65fab..b6d8f3d 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -67,7 +67,7 @@ __forceinline operator          int      ( ) const { return std::numeric_limits<
 #define _lzcnt_u64 __lzcnt64
 #endif
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__)
 
 __forceinline int __popcnt(int in) {
   return _mm_popcnt_u32(in);