From: Francis Dupont <fdupont@isc.org>
Date: Tue, 23 Jun 2015 17:42:03 +0000 (+0200)
Subject: [3870] Added a comment to explain the guard
X-Git-Tag: trac3919_base~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2c740a8cafdbb2ba13b2f37cfa25b9582b9ccc8;p=thirdparty%2Fkea.git

[3870] Added a comment to explain the guard
---

diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 835fe65b3f..8683f19a62 100644
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -33,6 +33,10 @@
 #include <iostream>
 #include <queue>
 
+// Undefine the macro OPTIONAL which is defined in some operating
+// systems but conflicts with a member of the RequirementLevel enum in
+// the server class.
+
 #ifdef OPTIONAL
 #undef OPTIONAL
 #endif
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 7571f2b976..63ad9ae22e 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -32,6 +32,10 @@
 #include <iostream>
 #include <queue>
 
+// Undefine the macro OPTIONAL which is defined in some operating
+// systems but conflicts with a member of the RequirementLevel enum in
+// the server class.
+
 #ifdef OPTIONAL
 #undef OPTIONAL
 #endif