aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-06-10 14:55:15 +0200
committerSverker Eriksson <[email protected]>2013-06-10 14:55:15 +0200
commitea638ae461a54ffc5610f5e44bc266dd2e41b2a6 (patch)
tree63868944e92a289cee4e8b585fe72b649a5db72b /erts/emulator/beam
parent56e08cb2d1faa279961413729e48ef1f3275a575 (diff)
parentaae984904cb79166c94a784cb6d1a4e6bfd3e7d7 (diff)
downloadotp-ea638ae461a54ffc5610f5e44bc266dd2e41b2a6.tar.gz
otp-ea638ae461a54ffc5610f5e44bc266dd2e41b2a6.tar.bz2
otp-ea638ae461a54ffc5610f5e44bc266dd2e41b2a6.zip
Merge branch 'sverk/darwin-unlimited-select' into maint
* sverk/darwin-unlimited-select: erts: Fix dynamic select for darwin erts: Refactor unlimited select patch erts: Fix bug in unlimited fd_set patch Use _DARWIN_UNLIMITED_SELECT in erl_poll
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_alloc.types1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 095ad24387..7e3b3c707d 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -397,6 +397,7 @@ type POLLSET_UPDREQ SHORT_LIVED SYSTEM pollset_update_req
type POLL_FDS LONG_LIVED SYSTEM poll_fds
type POLL_RES_EVS LONG_LIVED SYSTEM poll_result_events
type FD_STATUS LONG_LIVED SYSTEM fd_status
+type SELECT_FDS LONG_LIVED SYSTEM select_fds
+if unix