aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/inet_parse.erl
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-09-10 14:37:02 +0200
committerPatrik Nyblom <[email protected]>2010-09-10 14:37:02 +0200
commit6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02 (patch)
tree07492ef6b7f98ef05ecc47518038980173996480 /lib/kernel/src/inet_parse.erl
parentbf276aef756681bd2ccb31aff54b646ff6a68d73 (diff)
parent19a3f0c5bab37ba261abbca6c0253c1e3cb4d3ac (diff)
downloadotp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.gz
otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.bz2
otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.zip
Merge branch 'pan/added-autoimports/OTP-8763' into dev
* pan/added-autoimports/OTP-8763: Remove warnings for clashes with new autoimported BIFs Add testcase for autoimport and the erlang.xml doc consistency Correct erlang.xml regarding autoimports Add new autoimports for R14B
Diffstat (limited to 'lib/kernel/src/inet_parse.erl')
-rw-r--r--lib/kernel/src/inet_parse.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index 3bd5fa0958..65edddcb46 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -20,6 +20,8 @@
%% Parser for all kinds of ineternet configuration files
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
-export([hosts/1, hosts/2]).
-export([hosts_vxworks/1]).
-export([protocols/1, protocols/2]).