Fix:Core:Made compileable again for n800 and openmoko

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

diff --git a/navit/attr.h b/navit/attr.h
index c3bf6a4..7b159d4 100644 (file)
--- a/navit/attr.h
+++ b/navit/attr.h
@@ -24,7 +24,6 @@
 extern "C" {
 #endif
 
-#include <glib.h>
 #include "projection.h"
 
 enum item_type;
@@ -133,13 +132,7 @@ struct attr {
        } u;
 };
 
-struct attr_iter {
-       union {
-               GList *list;
-               struct mapset_handle *mapset_handle;
-       } u;
-};
-
+struct attr_iter;
 /* prototypes */
 enum attr_type attr_from_name(const char *name);
 char *attr_to_name(enum attr_type attr);

diff --git a/navit/navit.c b/navit/navit.c
index 58ff73e..05af244 100644 (file)
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -139,6 +139,13 @@ struct navit {
 
 struct gui *main_loop_gui;
 
+struct attr_iter {
+       union {
+               GList *list;
+               struct mapset_handle *mapset_handle;
+       } u;
+};
+
 static void navit_vehicle_update(struct navit *this_, struct navit_vehicle *nv);
 static void navit_vehicle_draw(struct navit *this_, struct navit_vehicle *nv, struct point *pnt);
 static int navit_add_vehicle(struct navit *this_, struct vehicle *v);

diff --git a/navit/vehicle.c b/navit/vehicle.c
index 89db36e..1fae775 100644 (file)
--- a/navit/vehicle.c
+++ b/navit/vehicle.c
@@ -245,7 +245,7 @@ vehicle_new(struct attr *parent, struct attr **attrs)
 struct attr_iter *
 vehicle_attr_iter_new(void)
 {
-       return g_new0(struct attr_iter,1);
+       return (struct attr_iter *)g_new0(void *,1);
 }
 
 void