*: fix config.h/zebra.h include order

config.h (or, transitively, zebra.h) must be the first include file
listed for autoconf things like _GNU_SOURCE and _POSIX_C_SOURCE to work
correctly.

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

diff --git a/babeld/babel_filter.c b/babeld/babel_filter.c
index ff5cca42a0a89c688054db4253a3e1454d9d3a37..31778901a62efb8567c6ee8edbaa60c15ebb1246 100644 (file)
--- a/babeld/babel_filter.c
+++ b/babeld/babel_filter.c
@@ -20,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "babel_filter.h"
 #include "vty.h"
 #include "filter.h"

diff --git a/babeld/kernel.c b/babeld/kernel.c
index ba2b58131c96ccac9036c519f7846aa9b53bbe55..d4c962af3b4390d38ce78ab57e1f742defe09003 100644 (file)
--- a/babeld/kernel.c
+++ b/babeld/kernel.c
@@ -21,6 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/time.h>
 #include <sys/param.h>
 #include <time.h>

diff --git a/babeld/neighbour.c b/babeld/neighbour.c
index c1592fb18a11c6167f05631e1f34063e170dff64..512b60e29a11491818dabfaf249ccf8b345cccb5 100644 (file)
--- a/babeld/neighbour.c
+++ b/babeld/neighbour.c
@@ -20,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/babeld/net.c b/babeld/net.c
index ad9a6bad92afad787eeb8a4e103cb676e4b18817..d1f6a4414291b2da7475c943f9ff96bc8bac7e1d 100644 (file)
--- a/babeld/net.c
+++ b/babeld/net.c
@@ -20,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>

diff --git a/babeld/resend.c b/babeld/resend.c
index 1f219774424cc57a7e2ff33d6462b05524720804..8949075f67d0beaced0dddd29f878780f726305d 100644 (file)
--- a/babeld/resend.c
+++ b/babeld/resend.c
@@ -20,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/time.h>
 #include <time.h>
 #include <string.h>

diff --git a/babeld/source.c b/babeld/source.c
index d6dd848952cb404f13c43cf2502fe49b643c9c96..75bca0620639d32f9f17cd01ea7b017818f8f0b0 100644 (file)
--- a/babeld/source.c
+++ b/babeld/source.c
@@ -20,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/babeld/util.c b/babeld/util.c
index 4a3ecace0ccad0748ac8dca4463b93fa273586fc..880cda2fce7ceb540fa067642192081cb9e303f6 100644 (file)
--- a/babeld/util.c
+++ b/babeld/util.c
@@ -21,6 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>

diff --git a/bgpd/bgp_flowspec.c b/bgpd/bgp_flowspec.c
index e29508bf3680d9e946bb77db9b40cc593a947386..c604135bfd1beccbae4a4310fb139709902d01c9 100644 (file)
--- a/bgpd/bgp_flowspec.c
+++ b/bgpd/bgp_flowspec.c
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "math.h"
-
 #include <zebra.h>
+#include <math.h>
+
 #include "prefix.h"
 #include "lib_errors.h"
 

diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index a427608f67d7b51edfd228d9f786087aafe09748..51504bb0ad5005f907f3ae6060727f0141a1ecd6 100644 (file)
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
-#include <errno.h>
-
 #include "lib/zebra.h"
 #include "lib/prefix.h"
 #include "lib/agg_table.h"

diff --git a/bgpd/rfapi/rfapi_ap.c b/bgpd/rfapi/rfapi_ap.c
index 691e1e4ec87281ee2d110b48a6a6259855395d65..c5fda15d33fc03c43e38b4346afcc33d99b0dd38 100644 (file)
--- a/bgpd/rfapi/rfapi_ap.c
+++ b/bgpd/rfapi/rfapi_ap.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <errno.h>
-
 #include "lib/zebra.h"
 #include "lib/prefix.h"
 #include "lib/agg_table.h"

diff --git a/bgpd/rfapi/rfapi_descriptor_rfp_utils.c b/bgpd/rfapi/rfapi_descriptor_rfp_utils.c
index 3217d34e77b37c42e3f22d2598a416de08226b5a..ce5acf002c20fa79932aac298a1946059cc45150 100644 (file)
--- a/bgpd/rfapi/rfapi_descriptor_rfp_utils.c
+++ b/bgpd/rfapi/rfapi_descriptor_rfp_utils.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
-#include <errno.h>
-
 #include "lib/zebra.h"
 #include "lib/prefix.h"
 #include "lib/table.h"

diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index 4c506da6865f881944fe62bc27d6728f14381e84..4601718f1209e063b3bc9dff299fa228d79bea65 100644 (file)
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -23,8 +23,6 @@
  * Purpose:    Handle import of routes from BGP to RFAPI
  */
 
-#include <errno.h>
-
 #include "lib/zebra.h"
 #include "lib/prefix.h"
 #include "lib/agg_table.h"

diff --git a/bgpd/rfapi/rfapi_monitor.c b/bgpd/rfapi/rfapi_monitor.c
index 59387240fabffe1d7145a58b403fed8bae2bbc79..f18c6bfe12999cee193f95707460f09d8f700ecd 100644 (file)
--- a/bgpd/rfapi/rfapi_monitor.c
+++ b/bgpd/rfapi/rfapi_monitor.c
@@ -24,8 +24,6 @@
 
 /* TBD remove unneeded includes */
 
-#include <errno.h>
-
 #include "lib/zebra.h"
 #include "lib/prefix.h"
 #include "lib/agg_table.h"

diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c
index 3ac217ff8942c8639b85d0c3575c776b0c35e936..008da30118a5ab34060436a5ef7b4ef963f1c986 100644 (file)
--- a/bgpd/rfapi/rfapi_rib.c
+++ b/bgpd/rfapi/rfapi_rib.c
@@ -23,8 +23,6 @@
  * Purpose:    maintain per-nve ribs and generate change lists
  */
 
-#include <errno.h>
-
 #include "lib/zebra.h"
 #include "lib/prefix.h"
 #include "lib/agg_table.h"

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index b2767da8b262c2d7c0e6c0bae12ab4c0973d83dd..cd751319eb5da387fd1e94f0a1404172ce368b6f 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
-#include <errno.h>
-
 #include "lib/zebra.h"
 #include "lib/prefix.h"
 #include "lib/agg_table.h"

diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c
index 75e57a029e042f47ee481fa7a86b2312e7e6e1a4..af3092232cf851ee10de6d38b54680b875546f71 100644 (file)
--- a/bgpd/rfp-example/librfp/rfp_example.c
+++ b/bgpd/rfp-example/librfp/rfp_example.c
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* stub rfp */
 #include "rfp_internal.h"
 #include "bgpd/rfapi/rfapi.h"

diff --git a/bgpd/rfp-example/rfptest/rfptest.c b/bgpd/rfp-example/rfptest/rfptest.c
index 53e1c33cfbb0f0406761b4d38b8850c713983014..48df6c0cc7689250b7ece7ffb786764ed7937617 100644 (file)
--- a/bgpd/rfp-example/rfptest/rfptest.c
+++ b/bgpd/rfp-example/rfptest/rfptest.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* dummy test program */
 #include <stdio.h>

diff --git a/eigrpd/eigrp_fsm.c b/eigrpd/eigrp_fsm.c
index eeefc519688ccce2c37f7298254b46bfa46b91be..d291cab4c0c7566237693ff29d127cb0e2c6b9c4 100644 (file)
--- a/eigrpd/eigrp_fsm.c
+++ b/eigrpd/eigrp_fsm.c
@@ -67,8 +67,8 @@
  * 7- state not changed, usually by receiving not last reply
  */
 
-#include <thread.h>
 #include <zebra.h>
+#include <thread.h>
 
 #include "prefix.h"
 #include "table.h"

diff --git a/ldpd/pfkey.c b/ldpd/pfkey.c
index 906737217c0e0513a7279b6658f9f9dde1e2ca22..a719d0cbb7067e5b5af614655b24bc6e21288be0 100644 (file)
--- a/ldpd/pfkey.c
+++ b/ldpd/pfkey.c
@@ -17,6 +17,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef __OpenBSD__
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/lib/csv.c b/lib/csv.c
index ce84783aa6f7570da98027cabbc489a8cf1cd4b6..10e62731d1dd3a4d9c9a8f79fa5dbb56a5f6989d 100644 (file)
--- a/lib/csv.c
+++ b/lib/csv.c
@@ -17,6 +17,11 @@
  * with this program; see the file COPYING; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/ferr.c b/lib/ferr.c
index fb5719d4de879e12bd2efdc632a6cf2bb854d5f0..afef196cec4ce3cfac14fdc7af747b28eabc91c0 100644 (file)
--- a/lib/ferr.c
+++ b/lib/ferr.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 <stdarg.h>
 #include <string.h>

diff --git a/lib/frrstr.c b/lib/frrstr.c
index 715e67b868c24bbe9adeb945f6aec9986850d3bb..85d968182b042f87a46f7eb33e9802339ca818d3 100644 (file)
--- a/lib/frrstr.c
+++ b/lib/frrstr.c
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>

diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c
index 51e7a3987e00297dcebc1cf9515989df792d4fb6..ef03e85217b4c10d703c2c1e67e7ff6cab5a87e5 100644 (file)
--- a/lib/grammar_sandbox.c
+++ b/lib/grammar_sandbox.c
@@ -23,6 +23,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "command.h"
 #include "memory_vty.h"
 #include "graph.h"

diff --git a/lib/grammar_sandbox_main.c b/lib/grammar_sandbox_main.c
index 264c7c48f00ec6a30d91670bf777c0710efce8a4..c9c942f9bf897a02599dea196ce1dcea5463556a 100644 (file)
--- a/lib/grammar_sandbox_main.c
+++ b/lib/grammar_sandbox_main.c
@@ -23,6 +23,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "command.h"
 #include "memory_vty.h"
 

diff --git a/lib/hook.c b/lib/hook.c
index 935064f4d2aee42cae984101c987684e2665221c..4fe305f282681009ec462869e75968e6af31fd47 100644 (file)
--- a/lib/hook.c
+++ b/lib/hook.c
@@ -20,6 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "memory.h"
 #include "hook.h"
 

diff --git a/lib/lib_errors.c b/lib/lib_errors.c
index 332a5b1d453aac833f4811dd1734a177b9f1a98c..2ddc571e688999eab79fa1412066e7379ffa5676 100644 (file)
--- a/lib/lib_errors.c
+++ b/lib/lib_errors.c
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "lib_errors.h"
 
 /* clang-format off */

diff --git a/lib/openbsd-tree.c b/lib/openbsd-tree.c
index 35bfce3a890d73e9cd9acd080bef56c7a2f39ee4..e8d13339b633cf8470628e625f3b68a0ea00eb06 100644 (file)
--- a/lib/openbsd-tree.c
+++ b/lib/openbsd-tree.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 <stdlib.h>
 
 #include <lib/openbsd-tree.h>

diff --git a/lib/ptm_lib.c b/lib/ptm_lib.c
index 69fd61e2a06998ea914551f4b02b3aeb71e43c24..7f868beda419048aef5a788c7e05af2c59b9919d 100644 (file)
--- a/lib/ptm_lib.c
+++ b/lib/ptm_lib.c
@@ -17,6 +17,11 @@
  * with this program; see the file COPYING; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>

diff --git a/lib/strlcat.c b/lib/strlcat.c
index be211f82a8e527a8ec8e1dda6cc47e14559460ee..39773d9ac89ef7cfe022cc444266eea243b9eee5 100644 (file)
--- a/lib/strlcat.c
+++ b/lib/strlcat.c
@@ -20,11 +20,13 @@
 /* adapted for Quagga from glibc patch submission originally from
  * Florian Weimer <fweimer@redhat.com>, 2016-05-18 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdint.h>
 #include <string.h>
 
-#include "config.h"
-
 #ifndef HAVE_STRLCAT
 #undef strlcat
 

diff --git a/lib/strlcpy.c b/lib/strlcpy.c
index b0c33ca7f42baeac4acd8dce8b9163fc5974b639..71ee9f1a5452740f3f585df1d81048b04d8a72b1 100644 (file)
--- a/lib/strlcpy.c
+++ b/lib/strlcpy.c
@@ -20,9 +20,11 @@
 /* adapted for Quagga from glibc patch submission originally from
  * Florian Weimer <fweimer@redhat.com>, 2016-05-18 */
 
-#include <string.h>
-
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
+#include <string.h>
 
 #ifndef HAVE_STRLCPY
 #undef strlcpy

diff --git a/nhrpd/linux.c b/nhrpd/linux.c
index 46a327b59f21265aa2bac727c951cb18a89a4ebf..85e941e7bacd1d63fed3300fe7e708df39c4f420 100644 (file)
--- a/nhrpd/linux.c
+++ b/nhrpd/linux.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>

diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c
index af78b3d9ee6a74f560ed13dcce6aa4279c4ac1d7..4c6827cb3d63536e4976426e02c373d95b397006 100644 (file)
--- a/nhrpd/netlink_arp.c
+++ b/nhrpd/netlink_arp.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <fcntl.h>
 #include <net/if.h>
 #include <netinet/if_ether.h>

diff --git a/nhrpd/netlink_gre.c b/nhrpd/netlink_gre.c
index 75ecaa70c124cf84756fc6094fe9ef3278161cd0..3fdfa9c31307d14af5121c7d182295d30141357c 100644 (file)
--- a/nhrpd/netlink_gre.c
+++ b/nhrpd/netlink_gre.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>

diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c
index 7ca9731765d2d1c6691d0d869e2a1eb67f24ef85..9301c2d515eba9084658e6f8167414d956361ca0 100644 (file)
--- a/nhrpd/nhrp_event.c
+++ b/nhrpd/nhrp_event.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c
index 3a42712748cd3b768820f0f0ca7d60df4c39cc96..ccca100db57940b038501c5a08b44cccd3958e20 100644 (file)
--- a/nhrpd/nhrp_interface.c
+++ b/nhrpd/nhrp_interface.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <net/if_arp.h>
 #include "zebra.h"
 #include "linklist.h"

diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c
index 737e70103e553e125c512ddc31a36b79e926c913..f99e566399b571f4a59faa195b31bbfdaf1f1006 100644 (file)
--- a/nhrpd/nhrp_main.c
+++ b/nhrpd/nhrp_main.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 
 #include "zebra.h"

diff --git a/nhrpd/nhrp_packet.c b/nhrpd/nhrp_packet.c
index e62ee1ef72206a17924c031a0d4281d85ce92c51..a983aa71bca91997184b3fe268e0768fee8b8868 100644 (file)
--- a/nhrpd/nhrp_packet.c
+++ b/nhrpd/nhrp_packet.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <netinet/if_ether.h>
 #include "nhrpd.h"
 #include "zbuf.h"

diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
index 44271d68ac7930697598e388b784d4a0aa51bc6d..e051830f8524681ea0ab0daa848dac472dd403ad 100644 (file)
--- a/nhrpd/nhrp_peer.c
+++ b/nhrpd/nhrp_peer.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <netinet/if_ether.h>
 
 #include "zebra.h"

diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
index 044529a5cab4c53a74a62172cd5f46d363aa5f51..e7b187f3b607eeac0f747fcdca6a29c118923d85 100644 (file)
--- a/nhrpd/nhrp_route.c
+++ b/nhrpd/nhrp_route.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "nhrpd.h"
 #include "table.h"
 #include "memory.h"

diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c
index 9ed2517069372b784a6afb1ab432abd8fb5d4a7b..84053b4b5d68ee8c31551297c5a322f50292376f 100644 (file)
--- a/nhrpd/nhrp_shortcut.c
+++ b/nhrpd/nhrp_shortcut.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "nhrpd.h"
 #include "table.h"
 #include "memory.h"

diff --git a/nhrpd/resolver.c b/nhrpd/resolver.c
index dfa5dc3df0537fb8bbc9f4a52c73a76a596cfbfa..f017d974dfd5adf1358b69b088f68fb2aab38f20 100644 (file)
--- a/nhrpd/resolver.c
+++ b/nhrpd/resolver.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ares.h>
 #include <ares_version.h>
 

diff --git a/nhrpd/vici.c b/nhrpd/vici.c
index 7cd703414ac9aee81c0c77e2d9b4fdc44a2d5f89..c1a99685f39d6e34c61c57cd59c08b68b3aca277 100644 (file)
--- a/nhrpd/vici.c
+++ b/nhrpd/vici.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/nhrpd/zbuf.c b/nhrpd/zbuf.c
index 6e7cad8aec2c5940fbfc538d8c5b910187db04f6..c662295083e79063f814c14bfeecdde45fd03880 100644 (file)
--- a/nhrpd/zbuf.c
+++ b/nhrpd/zbuf.c
@@ -7,7 +7,10 @@
  * (at your option) any later version.
  */
 
-#define _GNU_SOURCE
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>

diff --git a/nhrpd/znl.c b/nhrpd/znl.c
index 01b2f433af8b6128a56be47a116d103c22b23af8..6030987a1bdf25bb802d7068440628228a9482dd 100644 (file)
--- a/nhrpd/znl.c
+++ b/nhrpd/znl.c
@@ -7,6 +7,10 @@
  * (at your option) any later version.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>

diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index 62eca156f55d4ffbd694208c85bded837e9174f1..220de3234d2097fb9b0943d1e86a01394725d317 100644 (file)
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -24,6 +24,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/pimd/mtracebis.c b/pimd/mtracebis.c
index c0d95aeed9e3799542ee7097f3d982b899a8e98e..65c495eff04502a6f0ca35e74be2d362f4d0aa30 100644 (file)
--- a/pimd/mtracebis.c
+++ b/pimd/mtracebis.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
+
 #ifdef __linux__
 
 #include "pim_igmp_mtrace.h"

diff --git a/pimd/mtracebis_netlink.c b/pimd/mtracebis_netlink.c
index b4bf6bada34b256c4ef2eab050cdce6c1a05fbd9..30ee8f24abd7fb26a165818a84a6999ff5ed21ab 100644 (file)
--- a/pimd/mtracebis_netlink.c
+++ b/pimd/mtracebis_netlink.c
@@ -10,6 +10,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef __linux__
 
 #include <stdio.h>

diff --git a/pimd/mtracebis_routeget.c b/pimd/mtracebis_routeget.c
index 8c1cd8d96303b03995347409b10db6ddd3960986..8d974403ac631e8e100a5fba4c989f992bd6854a 100644 (file)
--- a/pimd/mtracebis_routeget.c
+++ b/pimd/mtracebis_routeget.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
+
 #ifdef __linux__
 
 #include <asm/types.h>

diff --git a/pimd/pim_igmp_stats.c b/pimd/pim_igmp_stats.c
index 428816e1f095d6d7a02b400e7d0d0a5ce0c26c60..40851a45299a356f05b7706b099c870c23158874 100644 (file)
--- a/pimd/pim_igmp_stats.c
+++ b/pimd/pim_igmp_stats.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 "pim_igmp_stats.h"
 
 void igmp_stats_init(struct igmp_stats *stats)

diff --git a/qpb/qpb_allocator.c b/qpb/qpb_allocator.c
index 7e5ba5b0ce40fb9e56edfe8f521674d25d05b053..aca611ba1952cef41179e371eccbfff443045bda 100644 (file)
--- a/qpb/qpb_allocator.c
+++ b/qpb/qpb_allocator.c
@@ -22,6 +22,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "linear_allocator.h"
 
 #include "qpb_allocator.h"

diff --git a/tests/isisd/test_fuzz_isis_tlv.c b/tests/isisd/test_fuzz_isis_tlv.c
index 3a56f83f0a9fffbc80bed240723172f055fef928..b75c1002d43034613d71ad7437f33b30d59696f8 100644 (file)
--- a/tests/isisd/test_fuzz_isis_tlv.c
+++ b/tests/isisd/test_fuzz_isis_tlv.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "test_fuzz_isis_tlv_tests.h"
 
 #include <zebra.h>

diff --git a/tests/test_lblmgr.c b/tests/test_lblmgr.c
index c751c0b12d03bf04d4260c77352279dc084c0338..652d7618a8665809411983ad4bbe438200550833 100644 (file)
--- a/tests/test_lblmgr.c
+++ b/tests/test_lblmgr.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "lib/stream.h"
 #include "lib/zclient.h"
 

diff --git a/tools/permutations.c b/tools/permutations.c
index 80441753e7a2b907e0da0f3cf522c0be87be05d3..c5109dc3e8823b626d82f3d676bfc38d3a0ae14d 100644 (file)
--- a/tools/permutations.c
+++ b/tools/permutations.c
@@ -20,6 +20,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "command.h"
 #include "graph.h"
 #include "vector.h"

diff --git a/tools/start-stop-daemon.c b/tools/start-stop-daemon.c
index de58e0a20e2b75756bc168828a9563872ad033da..e1cce85557a3e9528bc929ca63a9fb37446510fc 100644 (file)
--- a/tools/start-stop-daemon.c
+++ b/tools/start-stop-daemon.c
@@ -25,12 +25,17 @@
  *   the whole automake/config.h dance.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef HAVE_LXC
 #define _GNU_SOURCE
 #include <sched.h>
 #endif /* HAVE_LXC */
 
 #include <stddef.h>
+#undef VERSION
 #define VERSION "1.9.18"
 
 #define MIN_POLL_INTERVAL 20000 /*us*/