aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-02-18 08:53:21 +0100
committerHans Bolinder <[email protected]>2016-02-18 08:53:21 +0100
commit44faa18995371b985c7c0648a7dc1efff5e3afb5 (patch)
tree52669ebdb18ab1b3b6d86a35caf46392bb4a5d54
parentf291c30a891677a0f4710ab02a2a9d03d1232412 (diff)
parent521ed78a48b0e9b9561fc7e5697ce926ce0498c0 (diff)
downloadotp-44faa18995371b985c7c0648a7dc1efff5e3afb5.tar.gz
otp-44faa18995371b985c7c0648a7dc1efff5e3afb5.tar.bz2
otp-44faa18995371b985c7c0648a7dc1efff5e3afb5.zip
Merge branch 'maint'
* maint: kernel: Correct contract for inet:getifaddrs/1
-rw-r--r--lib/kernel/src/inet.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index b573112445..c1ae99ea24 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -289,7 +289,7 @@ getifaddrs(Socket) ->
-spec getifaddrs() -> {ok, Iflist} | {error, posix()} when
Iflist :: [{Ifname,[Ifopt]}],
Ifname :: string(),
- Ifopt :: {flag,[Flag]} | {addr,Addr} | {netmask,Netmask}
+ Ifopt :: {flags,[Flag]} | {addr,Addr} | {netmask,Netmask}
| {broadaddr,Broadaddr} | {dstaddr,Dstaddr}
| {hwaddr,Hwaddr},
Flag :: up | broadcast | loopback | pointtopoint