From 473c8b2ecfef65db185878f94545298e77d3524f Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sun, 21 May 2006 11:29:26 +0000
Subject: [PATCH] Nuke some compatibility crufts of resolver for 6.X and
 earlier.

X-MFC after:	never
---
 lib/libc/resolv/Symbol.map  | 3 ---
 lib/libc/resolv/h_errno.c   | 3 ---
 lib/libc/resolv/res_state.c | 9 ---------
 3 files changed, 15 deletions(-)

diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map
index 7fcd0d97e95c..068ce83e8a49 100644
--- a/lib/libc/resolv/Symbol.map
+++ b/lib/libc/resolv/Symbol.map
@@ -54,11 +54,8 @@ FBSD_1.0 {
 	p_secstodate;
 	__res_init;
 	__res_randomid;
-	___res;
-	___res_ext;
 	__h_errno;
 	__h_errno_set;
-	__h_error;
 	h_errno;
 	res_init;
 	__res_findzonecut2;
diff --git a/lib/libc/resolv/h_errno.c b/lib/libc/resolv/h_errno.c
index 4d471b49cbc4..88d15aee7f9c 100644
--- a/lib/libc/resolv/h_errno.c
+++ b/lib/libc/resolv/h_errno.c
@@ -44,6 +44,3 @@ __h_errno_set(res_state res, int err)
 {
 	h_errno = res->res_h_errno = err;
 }
-
-/* binary backward compatibility for FreeBSD 5.x and 6.x */
-__weak_reference(__h_errno, __h_error);
diff --git a/lib/libc/resolv/res_state.c b/lib/libc/resolv/res_state.c
index b2742ce42d3f..59c943060757 100644
--- a/lib/libc/resolv/res_state.c
+++ b/lib/libc/resolv/res_state.c
@@ -85,12 +85,3 @@ __res_state(void)
 	free(statp);
 	return (&_res);
 }
-
-/* binary backward compatibility for FreeBSD 5.x and 6.x */
-struct __res_state_ext *
-___res_ext(void)
-{
-	return (__res_state()->_u._ext.ext);
-}
-
-__weak_reference(__res_state, ___res);