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 | a555b3faf4d19fff92d5963475a9e13fa72019c0 (patch) | |
| tree | 8535be380c84b11fc3ef5e6a9c3fb800e6101963 /compiler-rt/lib/interception | |
| parent | 34b46ca48e045976ab5f68d6f7aa5bd78abf465d (diff) | |
| download | bcm5719-llvm-a555b3faf4d19fff92d5963475a9e13fa72019c0.tar.gz bcm5719-llvm-a555b3faf4d19fff92d5963475a9e13fa72019c0.zip | |
[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.
llvm-svn: 164486
Diffstat (limited to 'compiler-rt/lib/interception')
| -rw-r--r-- | compiler-rt/lib/interception/interception.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler-rt/lib/interception/interception.h b/compiler-rt/lib/interception/interception.h index 6ff7355684d..7dad07fc6eb 100644 --- a/compiler-rt/lib/interception/interception.h +++ b/compiler-rt/lib/interception/interception.h @@ -170,7 +170,11 @@ // challenging, as we don't even pass function type to // INTERCEPT_FUNCTION macro, only its name. namespace __interception { +#if defined(_WIN64) +typedef unsigned long long uptr; // NOLINT +#else typedef unsigned long uptr; // NOLINT +#endif // _WIN64 } // namespace __interception #define INCLUDED_FROM_INTERCEPTION_LIB |
