diff options
| author | Lukas Larsson <[email protected]> | 2014-10-20 17:48:09 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-10-20 17:48:09 +0200 |
| commit | 70baef6ba7582ab1ea85de40b5c45bed8d14f0b7 (patch) | |
| tree | 5076d5cf71ae58f03ff628c24b62c9aaf2ff4eed /erts/emulator/beam | |
| parent | c36765a19f48701c5216bc9eeb305aefe5031c71 (diff) | |
| parent | 2d3a39b5729a295d4e0ac416ff0280e3edca44c6 (diff) | |
| download | otp-70baef6ba7582ab1ea85de40b5c45bed8d14f0b7.tar.gz otp-70baef6ba7582ab1ea85de40b5c45bed8d14f0b7.tar.bz2 otp-70baef6ba7582ab1ea85de40b5c45bed8d14f0b7.zip | |
Merge branch 'lukas/erts/non-blocking-shell'
* lukas/erts/non-blocking-shell:
Fix io:columns/0 timeout when invoked via user
kernel,ssh: Add synchronous user_drv protocol
erts: Make writing to non-tty fds non-blocking
erts: Make tty driver non-blocking
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.types | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index df33bbc2f7..6163e4129a 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -414,6 +414,8 @@ type CS_PROG_PATH LONG_LIVED SYSTEM cs_prog_path type ENVIRONMENT TEMPORARY SYSTEM environment type PUTENV_STR SYSTEM SYSTEM putenv_string type PRT_REP_EXIT STANDARD SYSTEM port_report_exit +type SYS_BLOCKING STANDARD SYSTEM sys_blocking +type SYS_WRITE_BUF TEMPORARY SYSTEM sys_write_buf +endif |