diff options
| author | Henrik Nord <[email protected]> | 2015-11-16 13:25:03 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-11-16 13:25:03 +0100 |
| commit | 828867abc55c64f61dd4c0e67dc4e0ad5becf4dc (patch) | |
| tree | ef60e70964237923af6593eaddbecedeb060e250 /erts/preloaded | |
| parent | b1c85b4310d7b33ddcc6c121a95db1c12a83a882 (diff) | |
| parent | c16c45a587a199987dae799ea02fb9c32216854f (diff) | |
| download | otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.tar.gz otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.tar.bz2 otp-828867abc55c64f61dd4c0e67dc4e0ad5becf4dc.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/prim_inet.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index d5c8fd4268..bd74831bb7 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -232,7 +232,7 @@ bindx(S, AddFlag, Addrs) -> %% if timeout is given: %% timeout < 0 -> infinity %% 0 -> immediate connect (mostly works for loopback) -%% > 0 -> wait for timout ms if not connected then +%% > 0 -> wait for timeout ms if not connected then %% return {error, timeout} %% %% ASYNC_CONNECT(insock(), IP, Port, Timeout) -> {ok, S, Ref} | {error, Reason} @@ -273,7 +273,7 @@ async_connect(S, IP, Port, Time) -> %% if timeout is given: %% timeout < 0 -> infinity %% 0 -> immediate accept (poll) -%% > 0 -> wait for timout ms for accept if no accept then +%% > 0 -> wait for timeout ms for accept if no accept then %% return {error, timeout} %% %% ASYNC_ACCEPT(insock(), Timeout) |