Moved street_data to route.h

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@451 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/src/compass.c b/src/compass.c
index dff312e..2c67a7b 100644 (file)
--- a/src/compass.c
+++ b/src/compass.c
@@ -5,6 +5,7 @@
 #include "coord.h"
 #include "graphics.h"
 #include "transform.h"
+#include "item.h"
 #include "route.h"
 #include "vehicle.h"
 #include "navit.h"

diff --git a/src/graphics.c b/src/graphics.c
index 6dced9a..1bc9b3d 100644 (file)
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -13,9 +13,9 @@
 #include "plugin.h"
 #include "profile.h"
 #include "mapset.h"
+#include "layout.h"
 #include "route.h"
 #include "util.h"
-#include "layout.h"
 
 struct graphics
 {

diff --git a/src/navigation.c b/src/navigation.c
index b4b91c6..89fceb8 100644 (file)
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -55,14 +55,6 @@ struct navigation_list {
 #endif
 };
 
-struct street_data {
-       struct item item;
-       int count;
-       int limit;
-       struct coord c[0];
-};
-
-
 struct navigation *
 navigation_new(struct mapset *ms)
 {

diff --git a/src/phrase.c b/src/phrase.c
index bbaadc0..dcdbad2 100644 (file)
--- a/src/phrase.c
+++ b/src/phrase.c
@@ -1,6 +1,7 @@
 #include <time.h>
 #include <glib.h>
 #include "coord.h"
+#include "item.h"
 #include "route.h"
 #include "speech.h"
 #include "phrase.h"

diff --git a/src/route.c b/src/route.c
index 345d2a7..e797d3a 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -75,14 +75,6 @@ struct route_path_segment {
        struct route_path_segment *next;
 };
 
-
-struct street_data {
-       struct item item;
-       int count;
-       int limit;
-       struct coord c[0];
-};
-
 struct route_info {
        struct coord c;
        struct coord lp;
@@ -127,7 +119,6 @@ static void route_process_street_graph(struct route_graph *this, struct item *it
 static void route_graph_destroy(struct route_graph *this);
 static void route_path_update(struct route *this);
 
-
 static void
 route_path_destroy(struct route_path *this)
 {

diff --git a/src/track.c b/src/track.c
index 909e492..1183fba 100644 (file)
--- a/src/track.c
+++ b/src/track.c
@@ -21,14 +21,6 @@
 
 #endif
 
-struct street_data {
-        struct item item;
-        int count;
-        int limit;
-        struct coord c[0];
-};
-
-
 
 struct tracking_line
 {