*: 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)

diff --git a/isisd/topology/random.c b/isisd/topology/random.c
index 157cbdb274b0fdb84003e2612db2a76c43cca36b..be85f7ca188f069ff16b6f051e1a134f12c8af92 100644 (file)
--- 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 853144737481b302b6af745c56daa45d395bfa73..91a4799ced4705ad55f9edfeecef7468b8a54771 100644 (file)
--- 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 40147fb5b6f940bdcc01faa7b313c2d1a8b65aa5..22cfa7ba4dd6af29d5fe8f6fd334cf781511d30e 100644 (file)
--- 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 28b58b30e7f192bd7618a49ab12a307c875e405a..1c1eb19121a3a00efb3d40fa2c10a5d45ab13a53 100644 (file)
--- 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>

diff --git a/lib/getopt.c b/lib/getopt.c
index 064909d317cf3fdefec51fa2225d9b01ea08903c..7a58a8a8cca1fc0e81dfc7abb5159ae796f2e9fc 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -30,10 +30,6 @@
 # define _NO_PROTO
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <zebra.h>
 
 #if !defined __STDC__ || !__STDC__

diff --git a/lib/getopt1.c b/lib/getopt1.c
index fa766747a92e520a9cef4d8b659e8b8867ab4515..bd3099e7999b7c79dae7e460f44cff1d044ba2f7 100644 (file)
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -20,10 +20,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <zebra.h>
 #include "getopt.h"
 

diff --git a/lib/stream.c b/lib/stream.c
index 716f361dc85547e7e005bca608327c8543ad1cc0..4c237563a5762fb8743be5bfdf9c7933f0964cd1 100644 (file)
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -20,8 +20,8 @@
  * 02111-1307, USA.  
  */
 
-#include <stddef.h>
 #include <zebra.h>
+#include <stddef.h>
 
 #include "stream.h"
 #include "memory.h"

diff --git a/lib/workqueue.c b/lib/workqueue.c
index 3100b993831bf32a1da6626303d75d1fff0f8bfb..d351beb12474f0eaacef2fc4eed480e42e465dfb 100644 (file)
--- a/lib/workqueue.c
+++ b/lib/workqueue.c
@@ -21,7 +21,7 @@
  * 02111-1307, USA.  
  */
 
-#include <lib/zebra.h>
+#include <zebra.h>
 #include "thread.h"
 #include "memory.h"
 #include "workqueue.h"

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index d60967c377e8c801520864a61564784838e83cbc..2132b2742bfb2085d10de05ae180c4f423c2fa7b 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -20,10 +20,10 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
-#include <sys/ioctl.h>
-
 #include <zebra.h>
 
+#include <sys/ioctl.h>
+
 #include "command.h"
 #include "if.h"
 #include "prefix.h"

diff --git a/pimd/pim_igmp_join.c b/pimd/pim_igmp_join.c
index 151b2afdbe178cb09f3cd9493edffb6fdf412064..62e32c6014c0c04064f450478415f5978c1844b6 100644 (file)
--- a/pimd/pim_igmp_join.c
+++ b/pimd/pim_igmp_join.c
@@ -20,6 +20,8 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <string.h>

diff --git a/pimd/pim_int.c b/pimd/pim_int.c
index 0bdd772ff3adf714c10e5ab516dea0b7ec1c5729..208075190f2d19b56a56e405de2edc08657ef610 100644 (file)
--- a/pimd/pim_int.c
+++ b/pimd/pim_int.c
@@ -20,6 +20,8 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
+
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index afd025965894b0ebdbe7c029c2c016808551eff9..35493311f967eb9cbd81097db01da4348dbf4bc1 100644 (file)
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -20,9 +20,10 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
+
 #include <signal.h>
 
-#include <zebra.h>
 #include "sigevent.h"
 #include "memory.h"
 #include "log.h"

diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index 4e6bf7e0a66a0cb072ae638ac8bc78ae761c9122..2bb48f75a5bd542ef7200eef122515f92bbef6bd 100644 (file)
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -20,6 +20,7 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
 #include "pim_mroute.h"
 
 #include <sys/types.h>
@@ -31,7 +32,6 @@
 #include <netdb.h>
 #include <errno.h>
 
-#include <zebra.h>
 #include "log.h"
 #include "privs.h"
 

diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index af5a184d2f7258ed336f7eab9143eb1a36bdb5bf..3a8353cd8cb7466dac76b6d8b42729ea151677cb 100644 (file)
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -20,12 +20,12 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 
-#include <zebra.h>
-
 #include "log.h"
 
 #include "pim_str.h"

diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index 097b470baf77c83ee1a34e17f9e73f020f7738e6..4e5832cc657bab652fef61d1ea372ba2fd6d39b3 100644 (file)
--- a/pimd/pim_time.c
+++ b/pimd/pim_time.c
@@ -20,11 +20,12 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
+
 #include <string.h>
 #include <sys/time.h>
 #include <time.h>
 
-#include <zebra.h>
 #include "log.h"
 #include "thread.h"
 

diff --git a/pimd/pim_version.c b/pimd/pim_version.c
index fe7e56343c9e6c045d46a0f33ced833fe9655750..f3a5ee33595ef9646e35b9fd966160c6d49bca73 100644 (file)
--- a/pimd/pim_version.c
+++ b/pimd/pim_version.c
@@ -20,6 +20,8 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
+
 #include "pim_version.h"
 
 const char * const PIMD_VERSION = PIMD_VERSION_STR;

diff --git a/tests/prng.c b/tests/prng.c
index 8d78ea523b9ea09f412bd16f4990dada278f377b..bdcfb07af1dc873d6c9a4da80058031320ce73ad 100644 (file)
--- a/tests/prng.c
+++ b/tests/prng.c
@@ -23,6 +23,8 @@
  * 02111-1307, USA.
  */
 
+#include <zebra.h>
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/tests/test-cli.c b/tests/test-cli.c
index 3db44eec827309250a6cf95c0cab7fb76426210b..6fab6d52cb2495adcd13cb452913997b78015787 100644 (file)
--- a/tests/test-cli.c
+++ b/tests/test-cli.c
@@ -20,6 +20,8 @@
  * 02111-1307, USA.
  */
 
+#include <zebra.h>
+
 #include "common-cli.h"
 
 DUMMY_DEFUN(cmd0,  "arg ipv4 A.B.C.D");

diff --git a/tests/test-timer-correctness.c b/tests/test-timer-correctness.c
index 47c0b7376efd1fb5a03016f64c0c150ea2746fe8..e523929be11d3c5559beb9b3d5c99d841ced5c28 100644 (file)
--- a/tests/test-timer-correctness.c
+++ b/tests/test-timer-correctness.c
@@ -23,11 +23,11 @@
  * 02111-1307, USA.
  */
 
+#include <zebra.h>
+
 #include <stdio.h>
 #include <unistd.h>
 
-#include <zebra.h>
-
 #include "memory.h"
 #include "pqueue.h"
 #include "prng.h"

diff --git a/tests/test-timer-performance.c b/tests/test-timer-performance.c
index a529a5ce0ab57886c2cf8535f34918ad13bc4211..ee45ede6ac70f1985fca41c3a3fc3e3e1a67b48d 100644 (file)
--- a/tests/test-timer-performance.c
+++ b/tests/test-timer-performance.c
@@ -22,11 +22,12 @@
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#include <stdio.h>
-#include <unistd.h>
 
 #include <zebra.h>
 
+#include <stdio.h>
+#include <unistd.h>
+
 #include "thread.h"
 #include "pqueue.h"
 #include "prng.h"