diff options
author | Sverker Eriksson <[email protected]> | 2013-06-10 15:09:19 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-06-10 15:09:19 +0200 |
commit | e0f24e2e849c0277aa75e59bbc430dfc666e135b (patch) | |
tree | 861f3c36bba6547a858de0a90ac73dc2b88bfb6a /erts/emulator/beam | |
parent | a60a923d6ad01029494dfad34685983426b75093 (diff) | |
parent | 4d268f98716dfab50b5a42d8ed88c4c9b13fb557 (diff) | |
download | otp-e0f24e2e849c0277aa75e59bbc430dfc666e135b.tar.gz otp-e0f24e2e849c0277aa75e59bbc430dfc666e135b.tar.bz2 otp-e0f24e2e849c0277aa75e59bbc430dfc666e135b.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r-- | erts/emulator/beam/erl_alloc.types | 1 |
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 |