diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2017-11-10 04:27:47 +0000 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2017-11-10 04:27:47 +0000 |
| commit | 8d93d94612443a03d2e211d944e3097f66ba75d5 (patch) | |
| tree | 1d79280237204e8d0fce63276d127fd8f33a1046 /lib/msan | |
| parent | 0ed4f7262b862aec163f074a60d7710fc99d2d38 (diff) | |
[tsan] Use __sanitizer_siginfo from sanitizer_common
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@317872 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan')
| -rw-r--r-- | lib/msan/msan_interceptors.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc index f5822db28..7a5b621e3 100644 --- a/lib/msan/msan_interceptors.cc +++ b/lib/msan/msan_interceptors.cc @@ -1295,14 +1295,14 @@ static int sigaction_impl(int signo, const __sanitizer_sigaction *act, : (uptr)SignalHandler; if (cb != __sanitizer::sig_ign && cb != __sanitizer::sig_dfl) { atomic_store(&sigactions[signo], cb, memory_order_relaxed); - pnew_act->sigaction = (void (*)(int, void *, void *))new_cb; + pnew_act->sigaction = (decltype(pnew_act->sigaction))new_cb; } } res = REAL(sigaction)(signo, pnew_act, oldact); if (res == 0 && oldact) { uptr cb = (uptr)oldact->sigaction; if (cb != __sanitizer::sig_ign && cb != __sanitizer::sig_dfl) { - oldact->sigaction = (void (*)(int, void *, void *))old_cb; + oldact->sigaction = (decltype(oldact->sigaction))old_cb; } } } else { |