From dcc3baf7331f7cb920a73e0349a7622bfe46f647 Mon Sep 17 00:00:00 2001
From: Jose Fonseca <jfonseca@vmware.com>
Date: Mon, 18 Apr 2016 12:08:35 +0100
Subject: gallium: Include intrin.h instead of defining ourselves.

More portable, particularly when building with Clang, which implements
all MSVC intrisincs in its own intrin.h, but doesn't actually support
`#pragma instrinsic`.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---
 src/gallium/auxiliary/util/u_math.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/gallium/auxiliary/util/u_math.h')

diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index 10f158b7086..4e58e505572 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -50,6 +50,10 @@
 #include <strings.h> /* for ffs */
 #endif
 
+#if defined(_MSC_VER)
+#include <intrin.h>
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -357,8 +361,6 @@ util_half_inf_sign(int16_t x)
 #define FFS_DEFINED 1
 
 #if defined(_MSC_VER) && (_M_IX86 || _M_AMD64 || _M_IA64)
-unsigned char _BitScanForward(unsigned long* Index, unsigned long Mask);
-#pragma intrinsic(_BitScanForward)
 static inline
 unsigned long ffs( unsigned long u )
 {
-- 
cgit v1.2.3