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

8fb273bb · Francis Dupont · 95750a3a · 8fb273bb · 8fb273bb
Commit 8fb273bb authored May 18, 2015 by Francis Dupont
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

src/bin/dhcp4/dhcp4_srv.h src/bin/dhcp4/dhcp4_srv.h +4 -0

src/bin/dhcp6/dhcp6_srv.h src/bin/dhcp6/dhcp6_srv.h +4 -0

No files found.
--- 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 {


--- 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 {