From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 14 Feb 2017 02:31:26 +0000 (+0100)
Subject: ospfclient: fix gcc -O0 build
X-Git-Tag: frr-3.0-branchpoint~32^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5c088023db734b9fc23f533050266ddb6bab11a5;p=mirror%2Ffrr.git

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 fd53ab364c..c545d537fc 100644
--- 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 9a77a64cc4..43ffa1da8e 100644
--- 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"