ospf6d: Move header includes around to reflect reality

ospf6_network.h needs ospf6_top.h to be included
first.

This makes newer versions of gcc much much happier.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2020-10-08 10:38:45 -04:00
parent 0405eff37a
commit c527acf1eb
5 changed files with 4 additions and 5 deletions

View File

@ -31,10 +31,10 @@
#include "ospf6_lsa.h" #include "ospf6_lsa.h"
#include "ospf6_lsdb.h" #include "ospf6_lsdb.h"
#include "ospf6_top.h"
#include "ospf6_network.h" #include "ospf6_network.h"
#include "ospf6_message.h" #include "ospf6_message.h"
#include "ospf6_route.h" #include "ospf6_route.h"
#include "ospf6_top.h"
#include "ospf6_area.h" #include "ospf6_area.h"
#include "ospf6_interface.h" #include "ospf6_interface.h"
#include "ospf6_neighbor.h" #include "ospf6_neighbor.h"

View File

@ -31,10 +31,10 @@
#include "ospf6_proto.h" #include "ospf6_proto.h"
#include "ospf6_lsa.h" #include "ospf6_lsa.h"
#include "ospf6_lsdb.h" #include "ospf6_lsdb.h"
#include "ospf6_top.h"
#include "ospf6_network.h" #include "ospf6_network.h"
#include "ospf6_message.h" #include "ospf6_message.h"
#include "ospf6_top.h"
#include "ospf6_area.h" #include "ospf6_area.h"
#include "ospf6_neighbor.h" #include "ospf6_neighbor.h"
#include "ospf6_interface.h" #include "ospf6_interface.h"

View File

@ -30,9 +30,9 @@
#include "libospf.h" #include "libospf.h"
#include "ospf6_proto.h" #include "ospf6_proto.h"
#include "ospf6_top.h"
#include "ospf6_network.h" #include "ospf6_network.h"
#include "ospf6d.h" #include "ospf6d.h"
#include "ospf6_top.h"
struct in6_addr allspfrouters6; struct in6_addr allspfrouters6;
struct in6_addr alldrouters6; struct in6_addr alldrouters6;

View File

@ -21,7 +21,6 @@
#ifndef OSPF6_NETWORK_H #ifndef OSPF6_NETWORK_H
#define OSPF6_NETWORK_H #define OSPF6_NETWORK_H
struct ospf6 *ospf6;
extern struct in6_addr allspfrouters6; extern struct in6_addr allspfrouters6;
extern struct in6_addr alldrouters6; extern struct in6_addr alldrouters6;

View File

@ -27,6 +27,7 @@
#include "plist.h" #include "plist.h"
#include "ospf6_proto.h" #include "ospf6_proto.h"
#include "ospf6_top.h"
#include "ospf6_network.h" #include "ospf6_network.h"
#include "ospf6_lsa.h" #include "ospf6_lsa.h"
#include "ospf6_lsdb.h" #include "ospf6_lsdb.h"
@ -34,7 +35,6 @@
#include "ospf6_route.h" #include "ospf6_route.h"
#include "ospf6_zebra.h" #include "ospf6_zebra.h"
#include "ospf6_spf.h" #include "ospf6_spf.h"
#include "ospf6_top.h"
#include "ospf6_area.h" #include "ospf6_area.h"
#include "ospf6_interface.h" #include "ospf6_interface.h"
#include "ospf6_neighbor.h" #include "ospf6_neighbor.h"