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

[3870] Added the OPTIONAL macro guard for d2
---

diff --git a/src/bin/d2/d_cfg_mgr.h b/src/bin/d2/d_cfg_mgr.h
index c479f7eb5d..13e77a5e8e 100644
--- a/src/bin/d2/d_cfg_mgr.h
+++ b/src/bin/d2/d_cfg_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013, 2015 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -22,6 +22,13 @@
 #include <stdint.h>
 #include <string>
 
+// Undefine the macro OPTIONAL which is defined in some operating
+// systems but conflicts with class constant is the context base class.
+
+#ifdef OPTIONAL
+#undef OPTIONAL
+#endif
+
 namespace isc {
 namespace d2 {