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>

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index fabcc426eadedbb6221935fc2fe542a9fbc1f986..334f1bd2a5dd79c56c23053b6c1a059434ba3ce7 100644 (file)
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -31,10 +31,10 @@
 
 #include "ospf6_lsa.h"
 #include "ospf6_lsdb.h"
+#include "ospf6_top.h"
 #include "ospf6_network.h"
 #include "ospf6_message.h"
 #include "ospf6_route.h"
-#include "ospf6_top.h"
 #include "ospf6_area.h"
 #include "ospf6_interface.h"
 #include "ospf6_neighbor.h"

diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index eb8c414d9b015263efe82f6d5cc728217d293277..02daaf6c2c01324b7ad6d8c9c0e851be3401b623 100644 (file)
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -31,10 +31,10 @@
 #include "ospf6_proto.h"
 #include "ospf6_lsa.h"
 #include "ospf6_lsdb.h"
+#include "ospf6_top.h"
 #include "ospf6_network.h"
 #include "ospf6_message.h"
 
-#include "ospf6_top.h"
 #include "ospf6_area.h"
 #include "ospf6_neighbor.h"
 #include "ospf6_interface.h"

diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c
index abbb180d45642f7ec3c3df794c940574474f0ca9..6c83881bf44e623b8b3e43f288b5f4d8ed866c74 100644 (file)
--- a/ospf6d/ospf6_network.c
+++ b/ospf6d/ospf6_network.c
@@ -30,9 +30,9 @@
 
 #include "libospf.h"
 #include "ospf6_proto.h"
+#include "ospf6_top.h"
 #include "ospf6_network.h"
 #include "ospf6d.h"
-#include "ospf6_top.h"
 
 struct in6_addr allspfrouters6;
 struct in6_addr alldrouters6;

diff --git a/ospf6d/ospf6_network.h b/ospf6d/ospf6_network.h
index eeef0514f347aaa320519f0b4619a71a9e069d43..d11a611c4926fee1b06cb6b7c36d8b52d6289d55 100644 (file)
--- a/ospf6d/ospf6_network.h
+++ b/ospf6d/ospf6_network.h
@@ -21,7 +21,6 @@
 #ifndef OSPF6_NETWORK_H
 #define OSPF6_NETWORK_H
 
-struct ospf6 *ospf6;
 extern struct in6_addr allspfrouters6;
 extern struct in6_addr alldrouters6;
 

diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index e90448239106b59b43024809c51d19b0d93a45fb..65607fc1315717de0af1896d41c8f3412a6b4b04 100644 (file)
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -27,6 +27,7 @@
 #include "plist.h"
 
 #include "ospf6_proto.h"
+#include "ospf6_top.h"
 #include "ospf6_network.h"
 #include "ospf6_lsa.h"
 #include "ospf6_lsdb.h"
@@ -34,7 +35,6 @@
 #include "ospf6_route.h"
 #include "ospf6_zebra.h"
 #include "ospf6_spf.h"
-#include "ospf6_top.h"
 #include "ospf6_area.h"
 #include "ospf6_interface.h"
 #include "ospf6_neighbor.h"