diff options
author | Dominik Schmidt <dev@dominik-schmidt.de> | 2021-08-19 16:08:12 +0300 |
---|---|---|
committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2021-08-19 16:08:18 +0300 |
commit | 35381598ba286c9f735df3e96d7a374d91b523b9 (patch) | |
tree | aabebb3e595f8ff87386a0f854603f28952c1355 | |
parent | 8ea0cf72882ae80b1557e419ac6b3a102369360a (diff) |
Fix double declaration of tgkill
Taken from upstream commit:
https://chromium.googlesource.com/breakpad/breakpad/+/7e3c165000d44fa153a3270870ed500bc8bbb461%5E%21/#F0
-rw-r--r-- | 3rdparty/breakpad/client/linux/handler/exception_handler.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/3rdparty/breakpad/client/linux/handler/exception_handler.cc b/3rdparty/breakpad/client/linux/handler/exception_handler.cc index fc777a6..da926f8 100644 --- a/3rdparty/breakpad/client/linux/handler/exception_handler.cc +++ b/3rdparty/breakpad/client/linux/handler/exception_handler.cc @@ -103,12 +103,6 @@ #define PR_SET_PTRACER 0x59616d61 #endif -// A wrapper for the tgkill syscall: send a signal to a specific thread. -static int tgkill(pid_t tgid, pid_t tid, int sig) { - return syscall(__NR_tgkill, tgid, tid, sig); - return 0; -} - namespace google_breakpad { namespace { @@ -347,7 +341,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { // In order to retrigger it, we have to queue a new signal by calling // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is // due to the kernel sending a SIGABRT from a user request via SysRQ. - if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { + if (sys_tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { // If we failed to kill ourselves (e.g. because a sandbox disallows us // to do so), we instead resort to terminating our process. This will // result in an incorrect exit code. |