diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-08 15:44:08 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-08 15:44:08 +0200 |
| commit | ab2a31421b168e6755b1764d4f235add3ebac446 (patch) | |
| tree | 1288e8c6a3de8f2ae119f02df258611938e56d7c | |
| parent | c2cb1197bdffff78a5604b6cbe5ce6da57ac7eaf (diff) | |
| parent | 5cdb17a67c7e9b254e9eb161b4ae5534e0636c0d (diff) | |
| download | otp-ab2a31421b168e6755b1764d4f235add3ebac446.tar.gz otp-ab2a31421b168e6755b1764d4f235add3ebac446.tar.bz2 otp-ab2a31421b168e6755b1764d4f235add3ebac446.zip | |
Merge branch 'egil/remove-unused-files'
* egil/remove-unused-files:
Remove unused files from old native dns resolver
| -rw-r--r-- | erts/emulator/beam/erl_resolv_dns.c | 23 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_resolv_nodns.c | 23 |
2 files changed, 0 insertions, 46 deletions
diff --git a/erts/emulator/beam/erl_resolv_dns.c b/erts/emulator/beam/erl_resolv_dns.c deleted file mode 100644 index 9d76fa89f8..0000000000 --- a/erts/emulator/beam/erl_resolv_dns.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * %CopyrightBegin% - * - * Copyright Ericsson AB 1997-2009. 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 - * compliance with the License. You should have received a copy of the - * Erlang Public License along with this software. If not, it can be - * retrieved online at http://www.erlang.org/. - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and limitations - * under the License. - * - * %CopyrightEnd% - */ - -/* - * Set this to non-zero value if DNS should be used. - */ -int erl_use_resolver = 1; diff --git a/erts/emulator/beam/erl_resolv_nodns.c b/erts/emulator/beam/erl_resolv_nodns.c deleted file mode 100644 index f14ab68e27..0000000000 --- a/erts/emulator/beam/erl_resolv_nodns.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * %CopyrightBegin% - * - * Copyright Ericsson AB 1997-2009. 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 - * compliance with the License. You should have received a copy of the - * Erlang Public License along with this software. If not, it can be - * retrieved online at http://www.erlang.org/. - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and limitations - * under the License. - * - * %CopyrightEnd% - */ - -/* - * Set this to non-zero value if DNS should be used. - */ -int erl_use_resolver = 0; |