diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-02-22 16:12:46 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-02-22 16:12:46 +0000 |
| commit | 53e191e77e81c9c57455e78efa5daf7fae485062 (patch) | |
| tree | 16df4ed6e7986c214f8e436289f57fda77d52b9f /compiler-rt | |
| parent | fb927af24f4966ba6c488d38180a6cb9487f00fc (diff) | |
| download | bcm5719-llvm-53e191e77e81c9c57455e78efa5daf7fae485062.tar.gz bcm5719-llvm-53e191e77e81c9c57455e78efa5daf7fae485062.zip | |
AddressSanitizer: quick fix - undef INT32_MIN etc to avoid macro redefinition
llvm-svn: 151165
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/asan/asan_internal.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/compiler-rt/lib/asan/asan_internal.h b/compiler-rt/lib/asan/asan_internal.h index 8891e3af48c..a3c6b383f41 100644 --- a/compiler-rt/lib/asan/asan_internal.h +++ b/compiler-rt/lib/asan/asan_internal.h @@ -68,12 +68,18 @@ extern "C" void* _ReturnAddress(void); # define __INT64_C(c) c ## LL # define __UINT64_C(c) c ## ULL #endif // __WORDSIZE == 64 -# define INT32_MIN (-2147483647-1) -# define INT32_MAX (2147483647) -# define UINT32_MAX (4294967295U) -# define INT64_MIN (-__INT64_C(9223372036854775807)-1) -# define INT64_MAX (__INT64_C(9223372036854775807)) -# define UINT64_MAX (__UINT64_C(18446744073709551615)) +#undef INT32_MIN +#define INT32_MIN (-2147483647-1) +#undef INT32_MAX +#define INT32_MAX (2147483647) +#undef UINT32_MAX +#define UINT32_MAX (4294967295U) +#undef INT64_MIN +#define INT64_MIN (-__INT64_C(9223372036854775807)-1) +#undef INT64_MAX +#define INT64_MAX (__INT64_C(9223372036854775807)) +#undef UINT64_MAX +#define UINT64_MAX (__UINT64_C(18446744073709551615)) #define ASAN_DEFAULT_FAILURE_EXITCODE 1 |
