[llvm-commits] [compiler-rt] r169828 - in /compiler-rt/trunk/lib/asan: asan_allocator.cc asan_allocator.h

[Kostya Serebryany]

Author: kcc
Date: Tue Dec 11 01:27:59 2012
New Revision: 169828

URL: http://llvm.org/viewvc/llvm-project?rev=169828&view=rev
Log:
[asan] fix the Windows build

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

Modified: compiler-rt/trunk/lib/asan/asan_allocator.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.cc?rev=169828&r1=169827&r2=169828&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_allocator.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_allocator.cc Tue Dec 11 01:27:59 2012
@@ -38,10 +38,6 @@
 #include "sanitizer/asan_interface.h"
 #include "sanitizer_common/sanitizer_atomic.h"
 
-#if defined(_WIN32) && !defined(__clang__)
-#include <intrin.h>
-#endif
-
 namespace __asan {
 
 #define REDZONE ((uptr)(flags()->redzone))

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=169828&r1=169827&r2=169828&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_allocator.h (original)
+++ compiler-rt/trunk/lib/asan/asan_allocator.h Tue Dec 11 01:27:59 2012
@@ -182,6 +182,9 @@
 void asan_mz_force_unlock();
 
 // Log2 and RoundUpToPowerOfTwo should be inlined for performance.
+#if defined(_WIN32) && !defined(__clang__)
+#include <intrin.h>
+#endif
 
 static inline uptr Log2(uptr x) {
   CHECK(IsPowerOfTwo(x));