diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2012-11-06 12:47:42 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2012-11-06 12:47:42 +0000 |
| commit | bfa45e11e52081c55294355f36fa547f163dcc67 (patch) | |
| tree | afa2bbb3e1da13798446bc84800f74cf9ec50d5a | |
| parent | b1ed7fb74658fd98c5ab591b45b6e02112c0d69a (diff) | |
| download | compiler-rt-bfa45e11e52081c55294355f36fa547f163dcc67.tar.gz | |
tsan: fix windows build
__declspec is not _WIN32, it's _MSC_VER
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@167447 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_internal_defs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sanitizer_common/sanitizer_internal_defs.h b/lib/sanitizer_common/sanitizer_internal_defs.h index 9ace42ace..1c766ae49 100644 --- a/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/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 |