diff options
| author | Peter Andersson <[email protected]> | 2015-02-23 11:16:15 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-02-23 11:16:15 +0100 |
| commit | 32b790573fe3cc9ba3f9b0d66e1832f36094034b (patch) | |
| tree | c845ae420f063da1e46666748d8da6d540dedb02 /lib/kernel/src | |
| parent | d7e9dfbc8869089a56a9a28f2c23d211f5bc31d9 (diff) | |
| parent | 121b920ed5a729e69e21d8869d554d736c10f427 (diff) | |
| download | otp-32b790573fe3cc9ba3f9b0d66e1832f36094034b.tar.gz otp-32b790573fe3cc9ba3f9b0d66e1832f36094034b.tar.bz2 otp-32b790573fe3cc9ba3f9b0d66e1832f36094034b.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/inet.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 43bab8bcf0..ec2c350931 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2014. All Rights Reserved. +%% Copyright Ericsson AB 1997-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1070,7 +1070,7 @@ gethostbyname_tm(Name, Type, Timer, [wins|_]=Opts) -> gethostbyname_tm_native(Name, Type, Timer, Opts); gethostbyname_tm(Name, Type, Timer, [native|_]=Opts) -> gethostbyname_tm_native(Name, Type, Timer, Opts); -gethostbyname_tm(Name, Type, Timer, [_|_]=Opts) -> +gethostbyname_tm(Name, Type, Timer, [_|Opts]) -> gethostbyname_tm(Name, Type, Timer, Opts); %% Make sure we always can look up our own hostname. gethostbyname_tm(Name, Type, Timer, []) -> |