From e6b5a696e3dbb7b77e03d6bb6f62a9047fe7da1c Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 6 Nov 2012 12:47:42 +0000 Subject: [PATCH] tsan: fix windows build __declspec is not _WIN32, it's _MSC_VER llvm-svn: 167447 --- compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h index 9ace42a..1c766ae 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h @@ -24,7 +24,7 @@ using namespace __sanitizer; // NOLINT #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 @@ typedef unsigned long DWORD; // NOLINT # 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 @@ typedef unsigned long DWORD; // NOLINT # else # define NOTHROW __attribute__((__nothrow__)) #endif -#endif // _WIN32 +#endif // _MSC_VER // We have no equivalent of these on Windows. #ifndef _WIN32 -- 2.7.4