aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-09-11 15:22:19 +0200
committerLukas Larsson <[email protected]>2017-09-11 15:22:19 +0200
commit04541e8aca196dc76ecc585244ee168c37ddeec5 (patch)
tree72251ec28669b06290d2badfa2d5805db5a73e0e /erts/emulator/sys
parent3b916092c488ef9d1fe93ab9c0afda88d589d97e (diff)
parent8636dcaf22432712a63b26fffe9b0fb0ff451374 (diff)
downloadotp-04541e8aca196dc76ecc585244ee168c37ddeec5.tar.gz
otp-04541e8aca196dc76ecc585244ee168c37ddeec5.tar.bz2
otp-04541e8aca196dc76ecc585244ee168c37ddeec5.zip
Merge branch 'maint'
Conflicts: erts/emulator/sys/unix/sys.c
Diffstat (limited to 'erts/emulator/sys')
-rw-r--r--erts/emulator/sys/unix/sys.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 237614b0fb..d05028cabc 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -739,7 +739,6 @@ signum_to_signalterm(int signum)
}
}
-
static RETSIGTYPE generic_signal_handler(int signum)
{
smp_sig_notify(signum);