Fix some includes in MPR plugin
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 2 Feb 2017 07:23:19 +0000 (08:23 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 2 Feb 2017 07:23:19 +0000 (08:23 +0100)
src-plugins/nhdp/mpr/mpr.c
src-plugins/nhdp/mpr/neighbor-graph-flooding.c
src-plugins/nhdp/mpr/neighbor-graph-routing.c
src-plugins/nhdp/mpr/neighbor-graph-routing.h
src-plugins/nhdp/mpr/neighbor-graph.c
src-plugins/nhdp/mpr/selection-rfc7181.c
src-plugins/nhdp/mpr/selection-rfc7181.h

index d567061..a5c4a7b 100644 (file)
@@ -56,7 +56,6 @@
 #include "core/oonf_subsystem.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_rfc5444.h"
-#include "subsystems/oonf_timer.h"
 
 #include "nhdp/nhdp.h"
 #include "nhdp/nhdp_db.h"
index 7244993..6d4e3ca 100644 (file)
@@ -57,7 +57,6 @@
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_rfc5444.h"
-#include "subsystems/oonf_timer.h"
 
 #include "mpr/mpr_internal.h"
 #include "mpr/neighbor-graph-flooding.h"
@@ -270,4 +269,4 @@ mpr_calculate_neighbor_graph_flooding(const struct nhdp_domain *domain, struct m
   mpr_init_neighbor_graph(&data->neigh_graph, &_api_interface);
   _calculate_n1(domain, data);
   _calculate_n2(domain, data);
-}
\ No newline at end of file
+}
index 32ea8b5..895a197 100644 (file)
@@ -57,7 +57,6 @@
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_rfc5444.h"
-#include "subsystems/oonf_timer.h"
 
 #include "mpr/mpr_internal.h"
 #include "mpr/neighbor-graph-routing.h"
index 8489860..221a824 100644 (file)
  * @file
  */
 
-#include "neighbor-graph.h"
-
 #ifndef __NEIGHBOR_GRAPH_ROUTING__
 #define __NEIGHBOR_GRAPH_ROUTING__
 
 #include "nhdp/nhdp_domain.h"
 
+#include "neighbor-graph.h"
+
 void mpr_calculate_neighbor_graph_routing(const struct nhdp_domain *domain,
     struct neighbor_graph *graph);
 
index c402646..0e05d80 100644 (file)
@@ -59,7 +59,6 @@
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_class.h"
 #include "subsystems/oonf_rfc5444.h"
-#include "subsystems/oonf_timer.h"
 
 #include "mpr/mpr_internal.h"
 #include "mpr/neighbor-graph-flooding.h"
index aca7f0f..e13b2fb 100644 (file)
@@ -57,7 +57,6 @@
 #include "core/oonf_logging.h"
 #include "subsystems/oonf_rfc5444.h"
 #include "subsystems/oonf_class.h"
-#include "subsystems/oonf_timer.h"
 
 #include "mpr/mpr_internal.h"
 #include "mpr/neighbor-graph-flooding.h"
index 304746b..863d1b3 100644 (file)
  * @file
  */
 
-#include "neighbor-graph.h"
-
 #ifndef __SELECTION_RFC7181__
 #define __SELECTION_RFC7181__
 
 #include "nhdp/nhdp_domain.h"
 
+#include "neighbor-graph.h"
+
 void mpr_calculate_mpr_rfc7181(const struct nhdp_domain *, struct neighbor_graph *graph);
 
 #endif