diff options
| author | Patrik Nyblom <[email protected]> | 2012-04-18 11:56:19 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-04-18 11:56:19 +0200 |
| commit | cff02d4925bfd6ed88d9d7b897f4b4416e4643ce (patch) | |
| tree | edb748eddafa80d084cf5ef271d68b042d8f0a80 /erts/preloaded | |
| parent | 00668f8cbae565d482e9ad72a63f846cef8e8071 (diff) | |
| parent | a76628f8f0de895e318c11585a53983e476d692c (diff) | |
| download | otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.gz otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.bz2 otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.zip | |
Merge branch 'maint'
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 88600 -> 88612 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 6 |
2 files changed, 4 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex c01c121779..f50b8e9d43 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index f0264ba658..c55a90b3fb 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1725,7 +1725,8 @@ port_call(_Port, _Operation, _Data) -> links | name | input | - output. + output | + os_pid. -type port_info_result_item() :: {registered_name, RegName :: atom()} | @@ -1734,7 +1735,8 @@ port_call(_Port, _Operation, _Data) -> {links, Pids :: [pid()]} | {name, String :: string()} | {input, Bytes :: non_neg_integer()} | - {output, Bytes :: non_neg_integer()}. + {output, Bytes :: non_neg_integer()} | + {os_pid, OsPid :: non_neg_integer() | 'undefined'}. %% Shadowed by erl_bif_types: erlang:port_info/1 -spec erlang:port_info(Port) -> Result when |