diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-09-24 11:43:40 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-09-24 11:43:40 +0000 |
| commit | b46941a1d23012491a7a8a52718cacbde3c19ba1 (patch) | |
| tree | 3f7b5776b228f5bd3b21cf8880c1443ef1d34368 /lib/sanitizer_common/sanitizer_internal_defs.h | |
| parent | c6439621280cda29433eeed5abb62ed9833ba45a (diff) | |
| download | compiler-rt-b46941a1d23012491a7a8a52718cacbde3c19ba1.tar.gz | |
[ASan] Apply some ASan-relevant pieces of patch by Ruben Van Boxem. In the same time, remove ASan from CMake build on Windows after conversation with Timur. We don't want to support building ASan on Windows until it is in a working state.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@164486 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_internal_defs.h')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_internal_defs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_internal_defs.h b/lib/sanitizer_common/sanitizer_internal_defs.h index 6fdbd9758..00549f03c 100644 --- a/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/lib/sanitizer_common/sanitizer_internal_defs.h @@ -142,6 +142,8 @@ void NORETURN CheckFailed(const char *file, int line, const char *cond, // Limits for integral types. We have to redefine it in case we don't // have stdint.h (like in Visual Studio 9). +#undef __INT64_C +#undef __UINT64_C #if __WORDSIZE == 64 # define __INT64_C(c) c ## L # define __UINT64_C(c) c ## UL @@ -164,7 +166,7 @@ void NORETURN CheckFailed(const char *file, int line, const char *cond, enum LinkerInitialized { LINKER_INITIALIZED = 0 }; -#if !defined(_WIN32) || defined(__clang__) +#if !defined(_MSC_VER) || defined(__clang__) # define GET_CALLER_PC() (uptr)__builtin_return_address(0) # define GET_CURRENT_FRAME() (uptr)__builtin_frame_address(0) #else |