aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/unix
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-04-20 10:10:33 +0200
committerLukas Larsson <[email protected]>2017-04-20 10:10:33 +0200
commitf9ccb1d717a7bffaaf149b6199412cfb092e692b (patch)
treee35d2f288af9fb205116d23df100d0c3c28bd3b8 /erts/emulator/sys/unix
parentc6e15b7226fab368babb60704e863cb17ba627ba (diff)
parent8c665562272bac669ea400638d379f21495636af (diff)
downloadotp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.tar.gz
otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.tar.bz2
otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.zip
Merge branch 'lukas/erts/20_minor_fixes'
* lukas/erts/20_minor_fixes: erts: Rebuild etc executables if config.h changes erts: Fix new gcc warning in check io kernel: Add mem check to prim_file:large_write tc erts: Fix two compiler warnings on OS X erts: Fix erts_debug:df function info output erts: Get rid of some unused function warnings on os x
Diffstat (limited to 'erts/emulator/sys/unix')
-rw-r--r--erts/emulator/sys/unix/sys.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index f80f136d79..f7ee9bace0 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -550,11 +550,13 @@ void sys_sigrelease(int sig)
sigprocmask(SIG_UNBLOCK, &mask, (sigset_t *)NULL);
}
+#ifdef ERTS_HAVE_TRY_CATCH
void erts_sys_sigsegv_handler(int signo) {
if (signo == SIGSEGV) {
longjmp(erts_sys_sigsegv_jmp, 1);
}
}
+#endif
/*
* Function returns 1 if we can read from all values in between