aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-11-16 12:16:36 +0100
committerPatrik Nyblom <[email protected]>2012-11-16 12:18:58 +0100
commit9278347678eea78419c0c310f767eaa1f4be4040 (patch)
treeabfd99329547a69d714cdce86ba2a6ded031e511 /erts
parent8d0a8ed931deec5a52eaf3e63a1e99a9ed0aeba8 (diff)
parent353246f2b391aed59cf23b4e9035e7b6fb331f8c (diff)
downloadotp-9278347678eea78419c0c310f767eaa1f4be4040.tar.gz
otp-9278347678eea78419c0c310f767eaa1f4be4040.tar.bz2
otp-9278347678eea78419c0c310f767eaa1f4be4040.zip
Merge branch 'pan/erlang-spec-error/open_port'
* pan/erlang-spec-error/open_port: Fix spec for erlang:process_info/{1,2} Add 'hide' option to erlang:open_port/2 spec * Update preloaded erlang.beam OTP-10584 OTP-9684
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/erlang.beambin88548 -> 88564 bytes
-rw-r--r--erts/preloaded/src/erlang.erl5
2 files changed, 3 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 66b7a011d6..bf6d6e871b 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 646acf5798..9e814ae54b 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -1699,7 +1699,8 @@ nodes(_Arg) ->
| in
| out
| binary
- | eof.
+ | eof
+ | hide.
open_port(_PortName,_PortSettings) ->
erlang:nif_error(undefined).
@@ -1836,7 +1837,7 @@ process_flag(_Flag, _Value) ->
{group_leader, GroupLeader :: pid()} |
{heap_size, Size :: non_neg_integer()} |
{initial_call, mfa()} |
- {links, Pids :: [pid()]} |
+ {links, Pids :: [pid() | port()]} |
{last_calls, false | (Calls :: [mfa()])} |
{memory, Size :: non_neg_integer()} |
{message_que_len, MessageQueueLen :: non_neg_integer()} |