summaryrefslogtreecommitdiffstats
path: root/isisd
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2015-09-15 10:53:09 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-06-09 16:45:22 +0200
commit7a2fbbf0ee98f16021c4b809f342ee6cf4b7f8ac (patch)
treebdba881cf8f07846258451a81a03fdec456bcc0e /isisd
parentlib/zclient: Consolidate error reporting for zclient_read_header (diff)
downloadfrr-7a2fbbf0ee98f16021c4b809f342ee6cf4b7f8ac.tar.xz
frr-7a2fbbf0ee98f16021c4b809f342ee6cf4b7f8ac.zip
*: make sure zebra.h is always included first
zebra.h pulls in config.h, which results in fiddling with things like __FILE_OFFSET_BITS. It must always be included first, in order to set flags that influence the compiler via <features.h>. Signed-off-by: David Lamparter <equinox@opensourcerouting.org> (cherry picked from commit 821df2cf18e5978cc7ab532a8695444380d08270)
Diffstat (limited to 'isisd')
-rw-r--r--isisd/topology/random.c1
-rw-r--r--isisd/topology/spacyc.c1
-rw-r--r--isisd/topology/spgrid.c4
-rw-r--r--isisd/topology/sprand.c2
4 files changed, 6 insertions, 2 deletions
diff --git a/isisd/topology/random.c b/isisd/topology/random.c
index 157cbdb27..be85f7ca1 100644
--- a/isisd/topology/random.c
+++ b/isisd/topology/random.c
@@ -7,6 +7,7 @@
/* */
/*********************************************************************/
+#include <zebra.h>
#include <sys/types.h>
#include <sys/times.h>
diff --git a/isisd/topology/spacyc.c b/isisd/topology/spacyc.c
index 853144737..91a4799ce 100644
--- a/isisd/topology/spacyc.c
+++ b/isisd/topology/spacyc.c
@@ -1,3 +1,4 @@
+#include <zebra.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/isisd/topology/spgrid.c b/isisd/topology/spgrid.c
index 40147fb5b..22cfa7ba4 100644
--- a/isisd/topology/spgrid.c
+++ b/isisd/topology/spgrid.c
@@ -1,11 +1,11 @@
+#include <zebra.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "random.c"
-#include <zebra.h>
-
#include "thread.h"
#include "vty.h"
#include "log.h"
diff --git a/isisd/topology/sprand.c b/isisd/topology/sprand.c
index 28b58b30e..1c1eb1912 100644
--- a/isisd/topology/sprand.c
+++ b/isisd/topology/sprand.c
@@ -1,3 +1,5 @@
+#include <zebra.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>