From: Francis Dupont <fdupont@isc.org>
Date: Mon, 18 May 2015 11:13:58 +0000 (+0200)
Subject: [3870] protect OPTIONAL against a #define in system headers
X-Git-Tag: trac3919_base~7^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fb273bb0e96fe1bb1bfe2e9f29bbb18ef6da976;p=thirdparty%2Fkea.git

[3870] protect OPTIONAL against a #define in system headers
---

diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 6a05a245a7..835fe65b3f 100644
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -33,6 +33,10 @@
 #include <iostream>
 #include <queue>
 
+#ifdef OPTIONAL
+#undef OPTIONAL
+#endif
+
 namespace isc {
 namespace dhcp {
 
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 0099b7ea86..7571f2b976 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -32,6 +32,10 @@
 #include <iostream>
 #include <queue>
 
+#ifdef OPTIONAL
+#undef OPTIONAL
+#endif
+
 namespace isc {
 namespace dhcp {