*: config.h or zebra.h is the first #include

This is mostly relevant for Solaris, where config.h sets up some #define
that affect overall header behaviour, so it needs to be before anything
else.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/bgpd/bgp_addpath.c b/bgpd/bgp_addpath.c
index 63373cb9a73f5d1e5014711a83daaf86254dee3d..0ca4b613eecd2e52749316cb4ccd6b6b793979a7 100644 (file)
--- a/bgpd/bgp_addpath.c
+++ b/bgpd/bgp_addpath.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "bgp_addpath.h"
 #include "bgp_route.h"
 

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index a22d4d0a5a34df6c469bf8a4bc7daddc5192db06..dc8f6a735710e4476a476a27b57b46511403ff7a 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -22,6 +22,7 @@
 #include <zebra.h>
 #include <math.h>
 
+#include "printfrr.h"
 #include "prefix.h"
 #include "linklist.h"
 #include "memory.h"

diff --git a/lib/command_py.c b/lib/command_py.c
index 1554af172fa3d2b575849b390d4697c9abfa3db5..4ec116df330f38043c427a7d4ca2383780536a59 100644 (file)
--- a/lib/command_py.c
+++ b/lib/command_py.c
@@ -22,6 +22,12 @@
  * memory leak or SEGV for things that haven't been well-tested.
  */
 
+/* This file is "exempt" from having
+#include "config.h"
+ * as the first include statement because Python.h also does environment
+ * setup & these trample over each other.
+ */
+
 #include <Python.h>
 #include "structmember.h"
 #include <string.h>

diff --git a/lib/frrlua.c b/lib/frrlua.c
index b7d8eea6e8d3c715abd00dd453a3eb484f6a8648..26610556dc1051e653d095f87b3e014e7acc3270 100644 (file)
--- a/lib/frrlua.c
+++ b/lib/frrlua.c
@@ -20,7 +20,6 @@
  * with FRR; see the file COPYING.  If not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <stdio.h>
 
 #include <zebra.h>
 

diff --git a/lib/id_alloc.c b/lib/id_alloc.c
index 222ba651b407ed642274dbbcab1ae4c323c33981..7c7f2c46898602a4b9414aaa8b75bc2228f6d810 100644 (file)
--- a/lib/id_alloc.c
+++ b/lib/id_alloc.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "id_alloc.h"
 
 #include "log.h"

diff --git a/lib/typerb.c b/lib/typerb.c
index d361e7651e607b786efe25d8c1d6445fe9b18f5e..4c48d6434f411cdd8bf19381dadb542f9e2cf0ef 100644 (file)
--- a/lib/typerb.c
+++ b/lib/typerb.c
@@ -41,6 +41,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "typerb.h"
 
 #define RB_BLACK       0

diff --git a/lib/typesafe.c b/lib/typesafe.c
index 47a6d0af487f890f1ff27cdd10b84e2fc5f3604f..f2ca67b7c66b690f5f10c0b66ae0d9cbfa595184 100644 (file)
--- a/lib/typesafe.c
+++ b/lib/typesafe.c
@@ -14,6 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 4ba8d08fe3a3bd4d5800ab878cfcbe6cbdd2fed6..266d3ffcf521824ce13f4721a6fc55af6fdc162f 100644 (file)
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -19,6 +19,11 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  * MA 02110-1301 USA
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "if.h"
 #include "pimd.h"
 #include "pim_iface.h"

diff --git a/tests/lib/test_idalloc.c b/tests/lib/test_idalloc.c
index 3053c1c074a94eb4df312b75cd2b8460ff99a853..ce1582b1ba1087d2d8da2e493f19bdbc74f74c9d 100644 (file)
--- a/tests/lib/test_idalloc.c
+++ b/tests/lib/test_idalloc.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "id_alloc.h"
 
 #include <inttypes.h>

diff --git a/tests/lib/test_seqlock.c b/tests/lib/test_seqlock.c
index 6b2b9ed8a5bd5f5b3482773836a5f72519e7947d..9cc6f80702c2b68f3052c5626aa73dc525742dcf 100644 (file)
--- a/tests/lib/test_seqlock.c
+++ b/tests/lib/test_seqlock.c
@@ -18,6 +18,10 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 1707d3a68b6dff3751de6d6606fb31a8efe96379..abe1879c2634edb628b66c70b47afa8283ba73b0 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "lib/libfrr.h"
 #include "lib/debug.h"
 #include "lib/frratomic.h"