aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-09-05 15:01:16 +0200
committerSverker Eriksson <[email protected]>2013-09-05 15:01:16 +0200
commit255a481e654211768dcac3c4c32f86f52580b286 (patch)
tree6461bf6f6e9224ac02ce3d91c4e4cd218581d6f5 /erts/emulator/sys
parentabba9d918ab3377a9c895e05924612724c105c26 (diff)
parentb00a53c0d1dc0dea0231f7aae31ccc6f96577e77 (diff)
downloadotp-255a481e654211768dcac3c4c32f86f52580b286.tar.gz
otp-255a481e654211768dcac3c4c32f86f52580b286.tar.bz2
otp-255a481e654211768dcac3c4c32f86f52580b286.zip
Merge branch 'sverk/mac-select-assert-bug' into maint
* sverk/mac-select-assert-bug: erts: Fix faulty assert in "unlimited select" for mac
Diffstat (limited to 'erts/emulator/sys')
-rw-r--r--erts/emulator/sys/common/erl_poll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 5861b30315..7676d8872a 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -123,8 +123,8 @@ static ERTS_INLINE
int ERTS_SELECT(int nfds, ERTS_fd_set *readfds, ERTS_fd_set *writefds,
ERTS_fd_set *exceptfds, struct timeval *timeout)
{
- ASSERT(!readfds || readfds->sz >= nfds);
- ASSERT(!writefds || writefds->sz >= nfds);
+ ASSERT(!readfds || readfds->sz >= ERTS_FD_SIZE(nfds));
+ ASSERT(!writefds || writefds->sz >= ERTS_FD_SIZE(nfds));
ASSERT(!exceptfds);
return select(nfds,
(readfds ? readfds->ptr : NULL ),