[llvm-commits] [compiler-rt] r167447 - /compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h

Dmitry Vyukov dvyukov at google.com
Tue Nov 6 04:47:42 PST 2012


Author: dvyukov
Date: Tue Nov  6 06:47:42 2012
New Revision: 167447

URL: http://llvm.org/viewvc/llvm-project?rev=167447&view=rev
Log:
tsan: fix windows build
__declspec is not _WIN32, it's _MSC_VER


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

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h?rev=167447&r1=167446&r2=167447&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h Tue Nov  6 06:47:42 2012
@@ -24,7 +24,7 @@
 #define WEAK SANITIZER_WEAK_ATTRIBUTE
 
 // Platform-specific defs.
-#if defined(_WIN32)
+#if defined(_MSC_VER)
 typedef unsigned long    DWORD;  // NOLINT
 # define ALWAYS_INLINE __declspec(forceinline)
 // FIXME(timurrrr): do we need this on Windows?
@@ -35,7 +35,7 @@
 # define NORETURN __declspec(noreturn)
 # define THREADLOCAL   __declspec(thread)
 # define NOTHROW
-#else  // _WIN32
+#else  // _MSC_VER
 # define ALWAYS_INLINE __attribute__((always_inline))
 # define ALIAS(x) __attribute__((alias(x)))
 # define ALIGNED(x) __attribute__((aligned(x)))
@@ -48,7 +48,7 @@
 # else
 #   define NOTHROW __attribute__((__nothrow__))
 #endif
-#endif  // _WIN32
+#endif  // _MSC_VER
 
 // We have no equivalent of these on Windows.
 #ifndef _WIN32





More information about the llvm-commits mailing list