aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-04-22 13:18:29 +0200
committerDan Gudmundsson <[email protected]>2013-06-03 12:48:58 +0200
commit892fb14882ef356c90eda8aa02ca43c3db8b53da (patch)
treeb402413a10039cd205f11c0c689e9f49c24f5fca /erts/preloaded
parent75763bd57338b3efe8300ece094aacc8e1a7a467 (diff)
downloadotp-892fb14882ef356c90eda8aa02ca43c3db8b53da.tar.gz
otp-892fb14882ef356c90eda8aa02ca43c3db8b53da.tar.bz2
otp-892fb14882ef356c90eda8aa02ca43c3db8b53da.zip
erts: Change erlang:open_port/2 spec
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/erlang.beambin93520 -> 93584 bytes
-rw-r--r--erts/preloaded/src/erlang.erl6
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index a5c43435df..226e4c8a1f 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 6929ca3fa5..0df0768365 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -1714,15 +1714,15 @@ nodes(_Arg) ->
erlang:nif_error(undefined).
-spec open_port(PortName, PortSettings) -> port() when
- PortName :: {spawn, Command :: string()} |
- {spawn_driver, Command :: [byte()]} |
+ PortName :: {spawn, Command :: string() | binary()} |
+ {spawn_driver, Command :: string() | binary()} |
{spawn_executable, FileName :: file:name() } |
{fd, In :: non_neg_integer(), Out :: non_neg_integer()},
PortSettings :: [Opt],
Opt :: {packet, N :: 1 | 2 | 4}
| stream
| {line, L :: non_neg_integer()}
- | {cd, Dir :: string()}
+ | {cd, Dir :: string() | binary()}
| {env, Env :: [{Name :: string(), Val :: string() | false}]}
| {args, [string() | binary()]}
| {arg0, string() | binary()}