[master] added sockaddr.h

4291.	[cleanup]	Added a required include to dns/forward.h. [RT #41474]

diff --git a/CHANGES b/CHANGES
index 6911ae672b965da5dc72d87843af01ed25ad4fdb..f223754f577e361ab9ed8ef76e81a5df821efe13 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4291.  [cleanup]       Added a required include to dns/forward.h. [RT #41474]
+
 4290.  [func]          The timers returned by the statistics channel
                        (indicating current time, server boot time, and
                        most recent reconfiguration time) are now reported

diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index fa41c2af00c1d1b5ba6eb5f9e2cf8463a4fb0d44..c6b21471104032233c7cec2eef56372d5b084b9c 100644 (file)
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: forward.c,v 1.14 2009/09/02 23:48:02 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
@@ -24,7 +22,6 @@
 #include <isc/magic.h>
 #include <isc/mem.h>
 #include <isc/rwlock.h>
-#include <isc/sockaddr.h>
 #include <isc/util.h>
 
 #include <dns/forward.h>

diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index 836807e692bd38b5736933afe2e3e493658f115a..b2fdeb68fbdbea45dedced1b4719da9d64898c77 100644 (file)
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: forward.h,v 1.13 2009/09/02 23:48:02 tbox Exp $ */
-
 #ifndef DNS_FORWARD_H
 #define DNS_FORWARD_H 1
 
@@ -24,6 +22,7 @@
 
 #include <isc/lang.h>
 #include <isc/result.h>
+#include <isc/sockaddr.h>
 
 #include <dns/types.h>