[#2036] fixed header guards

diff --git a/src/bin/dhcp4/json_config_parser.h b/src/bin/dhcp4/json_config_parser.h
index 73fae45ac16d80d6bae9d8a65389fc0f0a826490..66c0f08ee7ebc45f8491422f47c6f324f0444e72 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.h
+++ b/src/bin/dhcp4/json_config_parser.h
@@ -4,6 +4,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#ifndef DHCP4_CONFIG_PARSER_H
+#define DHCP4_CONFIG_PARSER_H
+
 #include <cc/data.h>
 #include <cc/stamped_value.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
@@ -12,9 +15,6 @@
 #include <stdint.h>
 #include <string>
 
-#ifndef DHCP4_CONFIG_PARSER_H
-#define DHCP4_CONFIG_PARSER_H
-
 /// @todo: This header file and its .cc counterpart are very similar between
 /// DHCPv4 and DHCPv6. They should be merged. A ticket #2355.
 
@@ -56,8 +56,7 @@ class Dhcpv4Srv;
 /// @param check_only whether this configuration is for testing only
 /// @return answer that contains result of reconfiguration
 isc::data::ConstElementPtr
-configureDhcp4Server(Dhcpv4Srv&,
-                     isc::data::ConstElementPtr config_set,
+configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
                      bool check_only = false);
 
 }  // namespace dhcp