ospfclient: fix gcc -O0 build

the "static const" inside DECLARE_MTYPE still causes issues on gcc -O0
(re. gcc bug 69981).  Work around by disabling MTYPE declarations for
ospfclient.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c
index fd53ab364c6a9ed9cbcc8d3af33ef2b71245b070..c545d537fcab950de4b515c8d4e573bed8d868c6 100644 (file)
--- a/ospfclient/ospf_apiclient.c
+++ b/ospfclient/ospf_apiclient.c
@@ -36,6 +36,9 @@
 #include "log.h"
 #include "memory.h"
 
+/* work around gcc bug 69981, disable MTYPEs in libospf */
+#define _QUAGGA_OSPF_MEMORY_H
+
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_interface.h"
 #include "ospfd/ospf_asbr.h"

diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c
index 9a77a64cc418523d5f5d5eccde098c4345008513..43ffa1da8ee628f88c26a1cef41ed636b1edfcb3 100644 (file)
--- a/ospfclient/ospfclient.c
+++ b/ospfclient/ospfclient.c
@@ -32,6 +32,9 @@
 #include "privs.h"
 #include "log.h"
 
+/* work around gcc bug 69981, disable MTYPEs in libospf */
+#define _QUAGGA_OSPF_MEMORY_H
+
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_asbr.h"
 #include "ospfd/ospf_lsa.h"