[llvm-commits] [compiler-rt] r169855 - /compiler-rt/trunk/lib/asan/asan_allocator.h

[Timur Iskhodzhanov]

Author: timurrrr
Date: Tue Dec 11 06:03:06 2012
New Revision: 169855

URL: http://llvm.org/viewvc/llvm-project?rev=169855&view=rev
Log:
Hopefully fix the Windows build by not including intrin.h

Modified:
    compiler-rt/trunk/lib/asan/asan_allocator.h

Modified: compiler-rt/trunk/lib/asan/asan_allocator.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.h?rev=169855&r1=169854&r2=169855&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_allocator.h (original)
+++ compiler-rt/trunk/lib/asan/asan_allocator.h Tue Dec 11 06:03:06 2012
@@ -205,7 +205,12 @@
 
 // Log2 and RoundUpToPowerOfTwo should be inlined for performance.
 #if defined(_WIN32) && !defined(__clang__)
-#include <intrin.h>
+unsigned char _BitScanForward(unsigned long *index, unsigned long mask);
+unsigned char _BitScanReverse(unsigned long *index, unsigned long mask);
+#if defined(_WIN64)
+unsigned char _BitScanForward64(unsigned long *index, unsigned __int64 mask);
+unsigned char _BitScanReverse64(unsigned long *index, unsigned __int64 mask);
+#endif
 #endif
 
 static inline uptr Log2(uptr x) {