aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-10-03 10:34:44 +0200
committerLukas Larsson <[email protected]>2016-10-03 10:34:44 +0200
commit76656535d5211bb80a877401dcd45b3e6cd782a8 (patch)
treeb6a7e9601354c3423b9dd57479f40b6a471619bb
parenta0abdb8631d7bd7a154023950ccdcbf09c85b92d (diff)
parentd85475bf9461d854c12589f78201fd77bea11a17 (diff)
downloadotp-76656535d5211bb80a877401dcd45b3e6cd782a8.tar.gz
otp-76656535d5211bb80a877401dcd45b3e6cd782a8.tar.bz2
otp-76656535d5211bb80a877401dcd45b3e6cd782a8.zip
Merge branch 'lukas/erts/fix_errno_name/OTP-13927' into maint
* lukas/erts/fix_errno_name/OTP-13927: erts: Rename __errno in order to avoid conflict on openbsd
-rw-r--r--erts/emulator/sys/unix/sys.c4
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 */