diff options
author | Lukas Larsson <[email protected]> | 2016-10-03 10:34:55 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-10-03 10:36:19 +0200 |
commit | 764c6f0c046f2eebf258b0d5cfac1a55395107f1 (patch) | |
tree | 09b45492baaff8ff1a5275489916a3523a8c42e1 | |
parent | 4de2006a6fed05e6b524c56ad16b6e62a9d00817 (diff) | |
parent | 76656535d5211bb80a877401dcd45b3e6cd782a8 (diff) | |
download | otp-764c6f0c046f2eebf258b0d5cfac1a55395107f1.tar.gz otp-764c6f0c046f2eebf258b0d5cfac1a55395107f1.tar.bz2 otp-764c6f0c046f2eebf258b0d5cfac1a55395107f1.zip |
Merge branch 'maint'
-rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 089efec3e8..b0e623a5b9 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -715,13 +715,13 @@ static RETSIGTYPE suspend_signal(void) static RETSIGTYPE suspend_signal(int signum) #endif { - int res, buf[1], __errno = errno; + int res, buf[1], tmp_errno = errno; do { res = read(sig_suspend_fds[0], buf, sizeof(int)); } while (res < 0 && errno == EINTR); /* restore previous errno in case read changed it */ - errno = __errno; + errno = tmp_errno; } #endif /* #ifdef ERTS_SYS_SUSPEND_SIGNAL */ |