From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 20 Jun 2013 14:51:21 +0000 (-0400)
Subject: [2957] Moved header #ifdef to beginning of header file where
X-Git-Tag: bind10-1.2.0beta1-release~366^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae6f706d85ae90ca971d2cfef2abfe7e5bc7856d;p=thirdparty%2Fkea.git

[2957] Moved header #ifdef to beginning of header file where
they're supposed to be.
---

diff --git a/src/bin/d2/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h
index 54692ce8fc..ed4a561c5c 100644
--- a/src/bin/d2/d2_cfg_mgr.h
+++ b/src/bin/d2/d2_cfg_mgr.h
@@ -12,6 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#ifndef D2_CFG_MGR_H
+#define D2_CFG_MGR_H
+
 #include <asiolink/io_address.h>
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
@@ -21,9 +24,6 @@
 #include <stdint.h>
 #include <string>
 
-#ifndef D2_CFG_MGR_H
-#define D2_CFG_MGR_H
-
 namespace isc {
 namespace d2 {
 
diff --git a/src/bin/d2/d2_config.h b/src/bin/d2/d2_config.h
index deb8b525bf..d07a54c1a5 100644
--- a/src/bin/d2/d2_config.h
+++ b/src/bin/d2/d2_config.h
@@ -12,6 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#ifndef D2_CONFIG_H
+#define D2_CONFIG_H
+
 #include <asiolink/io_address.h>
 #include <cc/data.h>
 #include <d2/d_cfg_mgr.h>
@@ -23,9 +26,6 @@
 #include <stdint.h>
 #include <string>
 
-#ifndef D2_CONFIG_H
-#define D2_CONFIG_H
-
 namespace isc {
 namespace d2 {
 
@@ -69,7 +69,7 @@ namespace d2 {
 /// A DnsServerInfoListParser creates and invokes a DnsServerInfoParser for
 /// each server entry in its list.
 ///
-/// A DdnsServerInfoParser handles the scalars which belong to th server.
+/// A DdnsServerInfoParser handles the scalars which belong to the server.
 
 /// @brief Exception thrown when the error during configuration handling
 /// occurs.
diff --git a/src/bin/d2/d_cfg_mgr.h b/src/bin/d2/d_cfg_mgr.h
index b5e476937d..4f8b166553 100644
--- a/src/bin/d2/d_cfg_mgr.h
+++ b/src/bin/d2/d_cfg_mgr.h
@@ -12,6 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#ifndef D_CFG_MGR_H
+#define D_CFG_MGR_H
+
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
 #include <dhcpsrv/dhcp_parsers.h>
@@ -19,9 +22,6 @@
 #include <stdint.h>
 #include <string>
 
-#ifndef D_CFG_MGR_H
-#define D_CFG_MGR_H
-
 namespace isc {
 namespace d2 {