[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 6a05a245a7a4c73090f7c74ce68722d25e71faf7..835fe65b3f288572b1b36adbe9cf9c8d72abd927 100644 (file)
--- 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 0099b7ea865182cf6ace4625530f741dbf53937a..7571f2b976534fa327c86bddef6055887d381d7b 100644 (file)
--- 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 {