diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-06-14 14:54:11 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-06-14 14:54:38 +0400 |
| commit | 9073a81bceaa9142c562bb5beecc453fbe92f73e (patch) | |
| tree | cf91b168890822db7d8b97d4d9386466641f5d09 /intern | |
| parent | 0c1b4c35cdf5e8d1c9f3a8dfb990813f914fda59 (diff) | |
Fix compilation in cycles
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_simd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h index 0f65fab58b6..b6d8f3d25f0 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); |