From a2c740a8cafdbb2ba13b2f37cfa25b9582b9ccc8 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 23 Jun 2015 19:42:03 +0200 Subject: [PATCH] [3870] Added a comment to explain the guard --- src/bin/dhcp4/dhcp4_srv.h | 4 ++++ src/bin/dhcp6/dhcp6_srv.h | 4 ++++ 2 files changed, 8 insertions(+) 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 #include +// 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 #include +// 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 -- 2.47.2