aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-02-01 11:16:55 +0100
committerLukas Larsson <[email protected]>2019-02-01 11:16:55 +0100
commit572e233d8e5b1c894cfba0ce77cdb1426b946be2 (patch)
treed1e9c4322c197d1d2f3addbc00c3fc1c35117f87
parent6719ef2d144fe3b6e374d60b04b41ebaef304a7a (diff)
parent8ffb4e56172909b3b1acadaf7e9ec8f7dbe2c3e0 (diff)
downloadotp-572e233d8e5b1c894cfba0ce77cdb1426b946be2.tar.gz
otp-572e233d8e5b1c894cfba0ce77cdb1426b946be2.tar.bz2
otp-572e233d8e5b1c894cfba0ce77cdb1426b946be2.zip
Merge branch 'maint'
-rw-r--r--lib/kernel/src/erl_epmd.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index b7e8868911..7a14e2635c 100644
--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
@@ -77,8 +77,8 @@ stop() ->
%%
-spec port_please(Name, Host) -> {ok, Port, Version} | noport when
- Name :: string(),
- Host :: inet:ip_address(),
+ Name :: atom() | string(),
+ Host :: atom() | string() | inet:ip_address(),
Port :: non_neg_integer(),
Version :: non_neg_integer().
@@ -86,8 +86,8 @@ port_please(Node, Host) ->
port_please(Node, Host, infinity).
-spec port_please(Name, Host, Timeout) -> {ok, Port, Version} | noport when
- Name :: string(),
- Host :: inet:ip_address(),
+ Name :: atom() | string(),
+ Host :: atom() | string() | inet:ip_address(),
Timeout :: non_neg_integer() | infinity,
Port :: non_neg_integer(),
Version :: non_neg_integer().