diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2017-01-25 11:33:48 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2017-01-25 11:33:48 +0100 |
| commit | 38e359d0d8ca86601a867f22ac10995abca97e16 (patch) | |
| tree | 2058123559148d56e96c950037ea6c00339668e2 /erts/emulator/sys | |
| parent | aff5d7501af8081faeb2b6ead963c680765852f3 (diff) | |
| parent | 1706f9302887cf238862fb7d92ca8d77fcef71d3 (diff) | |
| download | otp-38e359d0d8ca86601a867f22ac10995abca97e16.tar.gz otp-38e359d0d8ca86601a867f22ac10995abca97e16.tar.bz2 otp-38e359d0d8ca86601a867f22ac10995abca97e16.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 2fc802a2c6..e135dbff99 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -119,9 +119,8 @@ erts_smp_atomic_t sys_misc_mem_sz; static void smp_sig_notify(char c); static int sig_notify_fds[2] = {-1, -1}; -#if !defined(ETHR_UNUSABLE_SIGUSRX) && defined(ERTS_THR_HAVE_SIG_FUNCS) +#ifdef ERTS_SYS_SUSPEND_SIGNAL static int sig_suspend_fds[2] = {-1, -1}; -#define ERTS_SYS_SUSPEND_SIGNAL SIGUSR2 #endif #endif |