[llvm-commits] [compiler-rt] r162997 - /compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic_msvc.h

[Dmitry Vyukov]

Author: dvyukov
Date: Fri Aug 31 09:11:33 2012
New Revision: 162997

URL: http://llvm.org/viewvc/llvm-project?rev=162997&view=rev
Log:
tsan: fix windows build (2)

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic_msvc.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic_msvc.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic_msvc.h?rev=162997&r1=162996&r2=162997&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic_msvc.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic_msvc.h Fri Aug 31 09:11:33 2012
@@ -24,10 +24,9 @@
 extern "C" long _InterlockedExchangeAdd(  // NOLINT
     long volatile * Addend, long Value);  // NOLINT
 #pragma intrinsic(_InterlockedExchangeAdd)
-extern "C" void *_InterlockedCompareExchangePointer(
+extern "C" void *InterlockedCompareExchangePointer(
     void *volatile *Destination,
     void *Exchange, void *Comparand);
-#pragma intrinsic(_InterlockedCompareExchangePointer)
 
 namespace __sanitizer {
 
@@ -111,12 +110,12 @@
   return v;
 }
 
-INLINE bool atomic_compare_exchange_strong(volatile uptr *a,
+INLINE bool atomic_compare_exchange_strong(volatile atomic_uintptr_t *a,
                                            uptr *cmp,
                                            uptr xchg,
                                            memory_order mo) {
   uptr cmpv = *cmp;
-  uptr prev = (uptr)_InterlockedCompareExchangePointer(
+  uptr prev = (uptr)InterlockedCompareExchangePointer(
       (void*volatile*)&a->val_dont_use, (void*)xchg, (void*)cmpv);
   if (prev == cmpv)
     return true;