summaryrefslogtreecommitdiffstats
path: root/ospfclient
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-02-14 03:31:26 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2017-02-14 03:31:26 +0100
commit5c088023db734b9fc23f533050266ddb6bab11a5 (patch)
treedc580e39456f3fba29c1b441e2022b14bf859f54 /ospfclient
parentMerge pull request #195 from opensourcerouting/cli_merge (diff)
downloadfrr-5c088023db734b9fc23f533050266ddb6bab11a5.tar.xz
frr-5c088023db734b9fc23f533050266ddb6bab11a5.zip
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>
Diffstat (limited to 'ospfclient')
-rw-r--r--ospfclient/ospf_apiclient.c3
-rw-r--r--ospfclient/ospfclient.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c
index fd53ab364..c545d537f 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 9a77a64cc..43ffa1da8 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"