diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-01-22 19:20:24 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-01-22 19:20:24 +0000 |
| commit | 9c710df9281cb5cffa849396f28c8fe1fc9f1be5 (patch) | |
| tree | 3451054a07a2086459ee553883b5773d5b5f860f /contrib/compiler-rt/lib/interception/interception.h | |
| parent | 58a7b5d64a70fcdddb5dc4c92e53d9d3abcb5ae6 (diff) | |
| parent | 0646903fc1f75f6e605754621119473ee083f4a4 (diff) | |
Merge compiler-rt trunk r351319, and resolve conflicts.
Notes
Notes:
svn path=/projects/clang800-import/; revision=343311
Diffstat (limited to 'contrib/compiler-rt/lib/interception/interception.h')
| -rw-r--r-- | contrib/compiler-rt/lib/interception/interception.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/compiler-rt/lib/interception/interception.h b/contrib/compiler-rt/lib/interception/interception.h index ddd6ec20979b..87b2365fd767 100644 --- a/contrib/compiler-rt/lib/interception/interception.h +++ b/contrib/compiler-rt/lib/interception/interception.h @@ -29,6 +29,7 @@ typedef __sanitizer::uptr SIZE_T; typedef __sanitizer::sptr SSIZE_T; typedef __sanitizer::sptr PTRDIFF_T; typedef __sanitizer::s64 INTMAX_T; +typedef __sanitizer::u64 UINTMAX_T; typedef __sanitizer::OFF_T OFF_T; typedef __sanitizer::OFF64_T OFF64_T; @@ -169,7 +170,7 @@ const interpose_substitution substitution_##func_name[] \ #elif !SANITIZER_MAC # define PTR_TO_REAL(x) real_##x # define REAL(x) __interception::PTR_TO_REAL(x) -# define FUNC_TYPE(x) x##_f +# define FUNC_TYPE(x) x##_type # define DECLARE_REAL(ret_type, func, ...) \ typedef ret_type (*FUNC_TYPE(func))(__VA_ARGS__); \ |