diff options
| author | Lukas Larsson <[email protected]> | 2017-04-20 10:10:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-04-20 10:10:33 +0200 |
| commit | f9ccb1d717a7bffaaf149b6199412cfb092e692b (patch) | |
| tree | e35d2f288af9fb205116d23df100d0c3c28bd3b8 /erts/emulator/sys | |
| parent | c6e15b7226fab368babb60704e863cb17ba627ba (diff) | |
| parent | 8c665562272bac669ea400638d379f21495636af (diff) | |
| download | otp-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')
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index 00c70268df..b6d71b3ec5 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -2306,7 +2306,7 @@ ERTS_CIO_EXPORT(erts_check_io)(int do_wait) case ERTS_EV_TYPE_NIF: { /* Requested via enif_select()... */ struct erts_nif_select_event in = {NIL}; struct erts_nif_select_event out = {NIL}; - ErtsResource* resource; + ErtsResource* resource = NULL; ErtsPollEvents revents = pollres[i].events; if (revents & ERTS_POLL_EV_ERR) { 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 |