From: deraadt <deraadt@openbsd.org>
Date: Sun, 18 Oct 2015 01:45:48 +0000 (+0000)
Subject: better placement for dnssocket/dnsconnect
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b5a7d377b9942f0c0bc0c13c167f86d40d241440;p=openbsd

better placement for dnssocket/dnsconnect
---

diff --git a/lib/libc/hidden/arpa/nameser.h b/lib/libc/hidden/arpa/nameser.h
index 9aaa7783366..04eb588bb74 100644
--- a/lib/libc/hidden/arpa/nameser.h
+++ b/lib/libc/hidden/arpa/nameser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nameser.h,v 1.2 2015/10/18 00:36:22 deraadt Exp $	*/
+/*	$OpenBSD: nameser.h,v 1.3 2015/10/18 01:45:48 deraadt Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,13 +20,7 @@
 
 #include_next <arpa/nameser.h>
 
-int	dnssocket(int, int, int);
-int	dnsconnect(int, const struct sockaddr *, socklen_t);
-
 PROTO_NORMAL(_getshort);
 PROTO_NORMAL(_getlong);
 
-PROTO_HIDDEN(dnssocket);
-PROTO_HIDDEN(dnsconnect);
-
 #endif /* !_LIBC_NAMESER_H_ */
diff --git a/lib/libc/hidden/asr.h b/lib/libc/hidden/asr.h
index 94fa18ccf5f..53baf5b28d0 100644
--- a/lib/libc/hidden/asr.h
+++ b/lib/libc/hidden/asr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr.h,v 1.1 2015/09/14 11:52:49 guenther Exp $	*/
+/*	$OpenBSD: asr.h,v 1.2 2015/10/18 01:45:48 deraadt Exp $	*/
 /*
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,6 +20,9 @@
 
 #include_next <asr.h>
 
+int	dnssocket(int, int, int);
+int	dnsconnect(int, const struct sockaddr *, socklen_t);
+
 PROTO_DEPRECATED(asr_abort);
 PROTO_NORMAL(asr_run);
 PROTO_NORMAL(asr_run_sync);
@@ -35,4 +38,7 @@ PROTO_NORMAL(res_query_async);
 PROTO_NORMAL(res_search_async);
 PROTO_NORMAL(res_send_async);
 
+PROTO_NORMAL(dnssocket);
+PROTO_NORMAL(dnsconnect);
+
 #endif	/* _LIBC_ASR_H_ */