Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/resolv/res_data.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/resolv/res_data.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- src/lib/libc/resolv/res_data.c	2004/05/21 16:03:05	1.6
+++ src/lib/libc/resolv/res_data.c	2004/05/22 23:47:09	1.7
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_data.c,v 1.6 2004/05/21 16:03:05 christos Exp $	*/
+/*	$NetBSD: res_data.c,v 1.7 2004/05/22 23:47:09 christos Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: res_data.c,v 1.1.206.2 2004/03/16 12:34:18 marka Exp";
 #else
-__RCSID("$NetBSD: res_data.c,v 1.6 2004/05/21 16:03:05 christos Exp $");
+__RCSID("$NetBSD: res_data.c,v 1.7 2004/05/22 23:47:09 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,17 +49,22 @@ __RCSID("$NetBSD: res_data.c,v 1.6 2004/
 
 #include "port_after.h"
 
-#if 0
 #ifdef __weak_alias
 __weak_alias(res_init,_res_init)
 __weak_alias(res_mkquery,_res_mkquery)
-__weak_alias(res_send_setqhook,__res_send_setqhook)
-__weak_alias(res_send_setrhook,__res_send_setrhook)
-__weak_alias(res_isourserver,__res_isourserver)
+__weak_alias(res_query,_res_query)
+__weak_alias(res_search,_res_search)
 __weak_alias(res_send,__res_send)
 __weak_alias(res_close,__res_close)
-__weak_alias(res_search,_res_search)
+/* XXX: these leaked in the old bind8 libc */
 __weak_alias(res_querydomain,__res_querydomain)
+__weak_alias(res_send_setqhook,__res_send_setqhook)
+__weak_alias(res_send_setrhook,__res_send_setrhook)
+#if 0
+__weak_alias(p_query,__p_query)
+__weak_alias(fp_query,__fp_query)
+__weak_alias(fp_nquery,__fp_nquery)
+__weak_alias(res_isourserver,__res_isourserver)
 __weak_alias(res_opt,_res_opt)
 __weak_alias(hostalias,__hostalias)
 #endif