Added include checks

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

diff --git a/navit/src/callback.h b/navit/src/callback.h
index c3fe401..50cc3e1 100644 (file)
--- a/navit/src/callback.h
+++ b/navit/src/callback.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_CALLBACK_H
+#define NAVIT_CALLBACK_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -72,3 +75,6 @@ static inline void callback_list_call_2(struct callback_list *l, void *p1, void
 #ifdef __cplusplus
 }
 #endif
+
+#endif
+

diff --git a/navit/src/color.h b/navit/src/color.h
index 9fdfd3b..1e7345f 100644 (file)
--- a/navit/src/color.h
+++ b/navit/src/color.h
@@ -1,3 +1,8 @@
+#ifndef NAVIT_COLOR_H
+#define NAVIT_COLOR_H
+
 struct color {
        int r,g,b;
 };
+
+#endif

diff --git a/navit/src/compass.h b/navit/src/compass.h
index 3bc8ad7..cb86417 100644 (file)
--- a/navit/src/compass.h
+++ b/navit/src/compass.h
@@ -1,2 +1,7 @@
+#ifndef NAVIT_COMPASS_H
+#define NAVIT_COMPASS_H
+
 struct compass * compass_new(struct container *co);
 void compass_draw(struct compass *comp, struct container *co);
+
+#endif

diff --git a/navit/src/coord.h b/navit/src/coord.h
index 13491d2..c388be7 100644 (file)
--- a/navit/src/coord.h
+++ b/navit/src/coord.h
@@ -1,5 +1,5 @@
-#ifndef COORD_H
-#define COORD_H
+#ifndef NAVIT_COORD_H
+#define NAVIT_COORD_H
 
 /*! A integer mercator coordinate */
 struct coord {

diff --git a/navit/src/country.h b/navit/src/country.h
index 83be5b9..68fe696 100644 (file)
--- a/navit/src/country.h
+++ b/navit/src/country.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_COUNTRY_H
+#define NAVIT_COUNTRY_H
+
 /* prototypes */
 struct attr;
 struct country_search;
@@ -5,3 +8,5 @@ struct item;
 struct country_search *country_search_new(struct attr *search, int partial);
 struct item *country_search_get_item(struct country_search *this);
 void country_search_destroy(struct country_search *this);
+
+#endif

diff --git a/navit/src/cursor.h b/navit/src/cursor.h
index ff14f05..ee64d8f 100644 (file)
--- a/navit/src/cursor.h
+++ b/navit/src/cursor.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_CURSOR_H
+#define NAVIT_CURSOR_H
+
 /* prototypes */
 struct callback;
 struct color;
@@ -14,3 +17,5 @@ int cursor_get_speed(struct cursor *this);
 struct cursor *cursor_new(struct graphics *gra, struct vehicle *v, struct color *c, struct transformation *t);
 void cursor_add_callback(struct cursor *this, struct callback *cb);
 /* end of prototypes */
+
+#endif

diff --git a/navit/src/data.h b/navit/src/data.h
index e2af6f9..4517426 100644 (file)
--- a/navit/src/data.h
+++ b/navit/src/data.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_DATA_H
+#define NAVIT_DATA_H
+
 static inline unsigned char
 get_u8(unsigned char **p)
 {
@@ -59,3 +62,5 @@ get_string(unsigned char **p)
 
 #define L(x) ({ unsigned char *t=(unsigned char *)&(x); t[0] | (t[1] << 8) | (t[2] << 16) | (t[3] << 24); })
 
+#endif
+

diff --git a/navit/src/data_window.h b/navit/src/data_window.h
index 2a96174..103697d 100644 (file)
--- a/navit/src/data_window.h
+++ b/navit/src/data_window.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_DATA_WINDOW_H
+#define NAVIT_DATA_WINDOW_H
+
 struct datawindow;
 struct param_list;
 struct datawindow_priv;
@@ -17,3 +20,6 @@ struct datawindow {
 void datawindow_destroy(struct datawindow *win);
 void datawindow_add(struct datawindow *win, struct param_list *param, int count);
 void datawindow_mode(struct datawindow *win, int start);
+
+#endif
+

diff --git a/navit/src/data_window_int.h b/navit/src/data_window_int.h
index fdf3354..f455a3a 100644 (file)
--- a/navit/src/data_window_int.h
+++ b/navit/src/data_window_int.h
@@ -1,3 +1,5 @@
+#ifndef NAVIT_DATA_WINDOW_INT_H
+#define NAVIT_DATA_WINDOW_INT_H
 
 struct data_window {
        GtkWidget *window;
@@ -5,3 +7,6 @@ struct data_window {
        GtkWidget *treeview;
        void(*callback)(struct data_window *, char **cols);
 };
+
+#endif
+

diff --git a/navit/src/debug.h b/navit/src/debug.h
index 57eb5ed..3fa0437 100644 (file)
--- a/navit/src/debug.h
+++ b/navit/src/debug.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_DEBUG_H
+#define NAVIT_DEBUG_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -17,3 +20,6 @@ void debug_printf(int level, const char *module, const char *function, int prefi
 #ifdef __cplusplus
 }
 #endif
+
+#endif
+

diff --git a/navit/src/destination.h b/navit/src/destination.h
index 263cc92..b019fc0 100644 (file)
--- a/navit/src/destination.h
+++ b/navit/src/destination.h
@@ -1,4 +1,10 @@
+#ifndef NAVIT_DESTINATION_H
+#define NAVIT_DESTINATION_H
+
 /* prototypes */
 struct navit;
 int destination_address(struct navit *nav);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/draw_info.h b/navit/src/draw_info.h
index 6acee92..863b001 100644 (file)
--- a/navit/src/draw_info.h
+++ b/navit/src/draw_info.h
@@ -1,5 +1,11 @@
+#ifndef NAVIT_DRAW_INFO_H
+#define NAVIT_DRAW_INFO_H
+
 struct draw_info {
        struct container *co;
        int display;
        int limit;
 };
+
+#endif
+

diff --git a/navit/src/file.h b/navit/src/file.h
index da69e24..ba56874 100644 (file)
--- a/navit/src/file.h
+++ b/navit/src/file.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_FILE_H
+#define NAVIT_FILE_H
+
 #include "param.h"
 
 struct file {
@@ -31,3 +34,6 @@ char **file_wordexp_get_array(struct file_wordexp *wexp);
 void file_wordexp_destroy(struct file_wordexp *wexp);
 int file_get_param(struct file *file, struct param_list *param, int count);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/graphics.h b/navit/src/graphics.h
index 5c2fc37..7e3eeec 100644 (file)
--- a/navit/src/graphics.h
+++ b/navit/src/graphics.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_GRAPHICS_H
+#define NAVIT_GRAPHICS_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -128,3 +131,6 @@ int graphics_displayitem_within_dist(struct displayitem *di, struct point *p, in
 #ifdef __cplusplus
 }
 #endif
+
+#endif
+

diff --git a/navit/src/gtkext.h b/navit/src/gtkext.h
index 34059d9..572057b 100644 (file)
--- a/navit/src/gtkext.h
+++ b/navit/src/gtkext.h
@@ -1 +1,6 @@
+#ifndef NAVIT_GTKEXT_H
+#define NAVIT_GTKEXT_H
+
 void gdk_gc_set_fill_rule(GdkGC *gc, GdkFillRule  fill_rule);
+
+#endif

diff --git a/navit/src/gui.h b/navit/src/gui.h
index c477d4d..c514102 100644 (file)
--- a/navit/src/gui.h
+++ b/navit/src/gui.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_GUI_H
+#define NAVIT_GUI_H
+
 struct navit;
 struct gui_priv;
 struct menu_methods;
@@ -45,3 +48,6 @@ int gui_set_graphics(struct gui *this_, struct graphics *gra);
 int gui_has_main_loop(struct gui *this_);
 int gui_run_main_loop(struct gui *this_);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/item.h b/navit/src/item.h
index fe24dd8..2d971ba 100644 (file)
--- a/navit/src/item.h
+++ b/navit/src/item.h
@@ -1,3 +1,5 @@
+#ifndef NAVIT_ITEM_H
+#define NAVIT_ITEM_H
 
 
 enum item_type {
@@ -51,3 +53,6 @@ int item_hash_remove(struct item_hash *h, struct item *item);
 void *item_hash_lookup(struct item_hash *h, struct item *item);
 void item_hash_destroy(struct item_hash *h);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/layer.h b/navit/src/layer.h
index 3415cf9..4d60212 100644 (file)
--- a/navit/src/layer.h
+++ b/navit/src/layer.h
@@ -1,6 +1,12 @@
+#ifndef NAVIT_LAYER_H
+#define NAVIT_LAYER_H
+
 enum layer_type {
        layer_town=0,
        layer_street,
        layer_poly,
        layer_end,
 };
+
+#endif
+

diff --git a/navit/src/layout.h b/navit/src/layout.h
index 91bfe27..083022c 100644 (file)
--- a/navit/src/layout.h
+++ b/navit/src/layout.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_LAYOUT_H
+#define NAVIT_LAYOUT_H
+
 #include "item.h"
 #include "color.h"
 
@@ -57,3 +60,6 @@ struct element *circle_new(struct color *color, int radius, int width, int label
 struct element *label_new(int label_size);
 struct element *icon_new(const char *src);
 struct element *image_new(void);
+
+#endif
+

diff --git a/navit/src/log.h b/navit/src/log.h
index 2bf0442..3f2658a 100644 (file)
--- a/navit/src/log.h
+++ b/navit/src/log.h
@@ -1,2 +1,8 @@
+#ifndef NAVIT_LOG_H
+#define NAVIT_LOG_H
+
 void log_write(char *message, struct file *file, void *data, int size);
 void log_apply(struct map_data *map, int files);
+
+#endif
+

diff --git a/navit/src/main.h b/navit/src/main.h
index 312a434..d1310d8 100644 (file)
--- a/navit/src/main.h
+++ b/navit/src/main.h
@@ -1,6 +1,12 @@
+#ifndef NAVIT_MAIN_H
+#define NAVIT_MAIN_H
+
 /* prototypes */
 struct navit;
 void main_add_navit(struct navit *nav);
 void main_remove_navit(struct navit *nav);
 int main(int argc, char **argv);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/map-share.h b/navit/src/map-share.h
index c540f30..2b534a6 100644 (file)
--- a/navit/src/map-share.h
+++ b/navit/src/map-share.h
@@ -1,2 +1,8 @@
+#ifndef NAVIT_MAP_SHARE_H
+#define NAVIT_MAP_SHARE_H
+
 void map_srv_start_poa(CORBA_ORB orb, CORBA_Environment * ev);
 CORBA_Object map_srv_start_object(CORBA_Environment * ev, struct container *co);
+
+#endif
+

diff --git a/navit/src/map.h b/navit/src/map.h
index 84e5b02..0377c49 100644 (file)
--- a/navit/src/map.h
+++ b/navit/src/map.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_MAP_H
+#define NAVIT_MAP_H
+
 struct map_priv;
 struct attr;
 #include "coord.h"
@@ -48,3 +51,5 @@ struct map_search *map_search_new(struct map *m, struct item *item, struct attr
 struct item *map_search_get_item(struct map_search *this);
 void map_search_destroy(struct map_search *this);
 /* end of prototypes */
+
+#endif

diff --git a/navit/src/map_data.h b/navit/src/map_data.h
index a38bd08..bb2aab9 100644 (file)
--- a/navit/src/map_data.h
+++ b/navit/src/map_data.h
@@ -1,3 +1,5 @@
+#ifndef NAVIT_MAP_DATA_H
+#define NAVIT_MAP_DATA_H
 
 enum file_index {
        file_border_ply=0,
@@ -28,3 +30,6 @@ struct block_info;
 
 void map_data_foreach(struct map_data *mdata, int file, struct transformation *t, int limit,
      void(*func)(struct block_info *, unsigned char *, unsigned char *, void *), void *data);
+
+#endif
+

diff --git a/navit/src/mapset.h b/navit/src/mapset.h
index 6998486..894dee1 100644 (file)
--- a/navit/src/mapset.h
+++ b/navit/src/mapset.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_MAPSET_H
+#define NAVIT_MAPSET_H
+
 /* prototypes */
 struct attr;
 struct item;
@@ -14,3 +17,6 @@ void mapset_close(struct mapset_handle *msh);
 struct mapset_search *mapset_search_new(struct mapset *ms, struct item *item, struct attr *search_attr, int partial);
 struct item *mapset_search_get_item(struct mapset_search *this);
 void mapset_search_destroy(struct mapset_search *this);
+
+#endif
+

diff --git a/navit/src/maptype.h b/navit/src/maptype.h
index b04d260..bfaf4e2 100644 (file)
--- a/navit/src/maptype.h
+++ b/navit/src/maptype.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_MAPTYPE_H
+#define NAVIT_MAPTYPE_H
+
 struct map_methods;
 
 struct maptype {
@@ -13,3 +16,6 @@ struct map_priv;
 struct maptype;
 void maptype_register(char *name, struct map_priv *(*map_new)(struct map_methods *meth, char *data, char **charset, enum projection *pro));
 struct maptype *maptype_get(const char *name);
+
+#endif
+

diff --git a/navit/src/menu.h b/navit/src/menu.h
index 8f40fbc..df36005 100644 (file)
--- a/navit/src/menu.h
+++ b/navit/src/menu.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_MENU_H
+#define NAVIT_MENU_H
+
 enum menu_type {
        menu_type_submenu,
        menu_type_menu,
@@ -25,3 +28,6 @@ void menu_route_update(struct container *co);
 struct menu *menu_add(struct menu *menu, char *name, enum menu_type type, void (*callback)(struct menu *menu, void *data1, void *data2), void *data1, void *data2);
 void menu_set_toggle(struct menu *menu, int active);
 int menu_get_toggle(struct menu *menu);
+
+#endif
+

diff --git a/navit/src/navigation.h b/navit/src/navigation.h
index a6df887..8e46e89 100644 (file)
--- a/navit/src/navigation.h
+++ b/navit/src/navigation.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_NAVIGATION_H
+#define NAVIT_NAVIGATION_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -24,3 +27,5 @@ void navigation_unregister_callback(struct navigation *this_, enum attr_type typ
 #ifdef __cplusplus
 }
 #endif
+
+#endif

diff --git a/navit/src/navit.h b/navit/src/navit.h
index 64a83a5..beb6de1 100644 (file)
--- a/navit/src/navit.h
+++ b/navit/src/navit.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_NAVIT_H
+#define NAVIT_NAVIT_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -81,3 +84,6 @@ void navit_destroy(struct navit *this_);
 #ifdef __cplusplus
 }
 #endif
+
+#endif
+

diff --git a/navit/src/osd.h b/navit/src/osd.h
index 0f28d12..9a50e99 100644 (file)
--- a/navit/src/osd.h
+++ b/navit/src/osd.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_OSD_H
+#define NAVIT_OSD_H
+
 struct osd_methods {
        void (*osd_destroy)(struct osd_priv *osd);
 };
@@ -8,3 +11,6 @@ struct navit;
 struct osd;
 struct osd *osd_new(struct navit *nav, const char *type, struct attr **attrs);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/param.h b/navit/src/param.h
index 496c054..e450cc7 100644 (file)
--- a/navit/src/param.h
+++ b/navit/src/param.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_PARAM_H
+#define NAVIT_PARAM_H
+
 struct param_list {
        char *name;
        char *value;    
@@ -7,3 +10,6 @@ void param_add_string(char *name, char *value, struct param_list **param, int *c
 void param_add_dec(char *name, unsigned long value, struct param_list **param, int *count);
 void param_add_hex(char *name, unsigned long value, struct param_list **param, int *count);
 void param_add_hex_sig(char *name, long value, struct param_list **param, int *count);
+
+#endif
+

diff --git a/navit/src/phrase.h b/navit/src/phrase.h
index 9f35738..5fd1af2 100644 (file)
--- a/navit/src/phrase.h
+++ b/navit/src/phrase.h
@@ -1,2 +1,8 @@
+#ifndef NAVIT_PHRASE_H
+#define NAVIT_PHRASE_H
+
 void phrase_route_calc(void *speech);
 void phrase_route_calculated(void *speech, void *route);
+
+#endif
+

diff --git a/navit/src/plugin.h b/navit/src/plugin.h
index 7cd1a8a..9614b19 100644 (file)
--- a/navit/src/plugin.h
+++ b/navit/src/plugin.h
@@ -125,3 +125,5 @@ void *plugin_get_type(enum plugin_type type, const char *name);
 #ifdef __cplusplus
 }
 #endif
+
+

diff --git a/navit/src/point.h b/navit/src/point.h
index 6672f3d..1ea5fd2 100644 (file)
--- a/navit/src/point.h
+++ b/navit/src/point.h
@@ -1,5 +1,5 @@
-#ifndef POINT_H
-#define POINT_H
+#ifndef NAVIT_POINT_H
+#define NAVIT_POINT_H
 
 struct point {
        int x;

diff --git a/navit/src/popup.h b/navit/src/popup.h
index 13be980..3738c35 100644 (file)
--- a/navit/src/popup.h
+++ b/navit/src/popup.h
@@ -1,3 +1,8 @@
+#ifndef NAVIT_POPUP_H
+#define NAVIT_POPUP_H
+
 struct navit;
 struct point;
 void popup(struct navit *nav, int button, struct point *p);
+
+#endif

diff --git a/navit/src/profile.h b/navit/src/profile.h
index 0a548d6..f5e853e 100644 (file)
--- a/navit/src/profile.h
+++ b/navit/src/profile.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_PROFILE_H
+#define NAVIT_PROFILE_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -6,3 +9,6 @@ void profile_timer(int level, const char *module, const char *function, const ch
 #ifdef __cplusplus
 }
 #endif
+
+#endif
+

diff --git a/navit/src/projection.h b/navit/src/projection.h
index 9d73f1b..361de78 100644 (file)
--- a/navit/src/projection.h
+++ b/navit/src/projection.h
@@ -1,3 +1,9 @@
+#ifndef NAVIT_PROJECTION_H
+#define NAVIT_PROJECTION_H
+
 enum projection {
        projection_none, projection_mg, projection_garmin
 };
+
+#endif
+

diff --git a/navit/src/route.h b/navit/src/route.h
index 1ba758c..6ac7685 100644 (file)
--- a/navit/src/route.h
+++ b/navit/src/route.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_ROUTE_H
+#define NAVIT_ROUTE_H
+
 struct route_crossing {
        long segid;
        int dir;
@@ -11,12 +14,22 @@ struct route_crossings {
 #define route_item_first type_street_0
 #define route_item_last type_ferry
 
-
 /* prototypes */
 enum item_type;
 struct coord;
 struct displaylist;
 struct item;
+
+#ifndef STREETDATA 
+#define STREETDATA 
+struct street_data {
+       struct item item;
+       int count;
+       int limit;
+       struct coord c[0];
+};
+#endif
+
 struct map_selection;
 struct mapset;
 struct route;
@@ -60,3 +73,6 @@ struct coord *route_info_get(struct route_info_handle *h);
 void route_info_close(struct route_info_handle *h);
 void route_draw(struct route *this, struct transformation *t, struct displaylist *dsp);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/search.h b/navit/src/search.h
index 0a09494..6043c50 100644 (file)
--- a/navit/src/search.h
+++ b/navit/src/search.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_SEARCH_H
+#define NAVIT_SEARCH_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -43,3 +46,6 @@ void search_list_destroy(struct search_list *this_);
 #ifdef __cplusplus
 }
 #endif
+
+#endif
+

diff --git a/navit/src/speech.h b/navit/src/speech.h
index 0542d82..46f199e 100644 (file)
--- a/navit/src/speech.h
+++ b/navit/src/speech.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_SPEECH_H
+#define NAVIT_SPEECH_H
+
 struct speech_priv;
 
 struct speech_methods {
@@ -11,3 +14,6 @@ int speech_say(struct speech *this_, const char *text);
 int speech_sayf(struct speech *this_, const char *format, ...);
 void speech_destroy(struct speech *this_);
 /* end of prototypes */
+
+#endif
+

diff --git a/navit/src/statusbar.h b/navit/src/statusbar.h
index 1411ef7..c315de7 100644 (file)
--- a/navit/src/statusbar.h
+++ b/navit/src/statusbar.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_STATUSBAR_H
+#define NAVIT_STATUSBAR_H
+
 struct route;
 struct statusbar_priv;
 struct point;
@@ -16,3 +19,6 @@ struct statusbar {
 };
 
 /* prototypes */
+
+#endif
+

diff --git a/navit/src/track.h b/navit/src/track.h
index 2c476a8..d6885bc 100644 (file)
--- a/navit/src/track.h
+++ b/navit/src/track.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_TRACK_H
+#define NAVIT_TRACK_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -18,3 +21,5 @@ void tracking_destroy(struct tracking *tr);
 #ifdef __cplusplus
 }
 #endif
+
+#endif

diff --git a/navit/src/transform.h b/navit/src/transform.h
index 6c9059e..ec0402d 100644 (file)
--- a/navit/src/transform.h
+++ b/navit/src/transform.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_TRANSFORM_H
+#define NAVIT_TRANSFORM_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,3 +48,5 @@ int transform_within_border(struct transformation *this_, struct point *p, int b
 #ifdef __cplusplus
 }
 #endif
+
+#endif

diff --git a/navit/src/types.h b/navit/src/types.h
index f9ee6ab..0fa5b5a 100644 (file)
--- a/navit/src/types.h
+++ b/navit/src/types.h
@@ -1,5 +1,5 @@
-#ifndef _TYPES_H_
-#define _TYPES_H_
+#ifndef NAVIT_TYPES_H
+#define NAVIT_TYPES_H
 #include <stdint.h>
 
 typedef int8_t s8;

diff --git a/navit/src/util.h b/navit/src/util.h
index 18c62ac..8e9690a 100644 (file)
--- a/navit/src/util.h
+++ b/navit/src/util.h
@@ -1,5 +1,11 @@
+#ifndef NAVIT_types_H
+#define NAVIT_types_H
+
 #include <ctype.h>
 
 void strtoupper(char *dest, const char *src);
 void strtolower(char *dest, const char *src);
 GList * g_hash_to_list(GHashTable *h);
+
+#endif
+

diff --git a/navit/src/vehicle.h b/navit/src/vehicle.h
index a4fc70b..b958379 100644 (file)
--- a/navit/src/vehicle.h
+++ b/navit/src/vehicle.h
@@ -1,3 +1,6 @@
+#ifndef NAVIT_VEHICLE_H
+#define NAVIT_VEHICLE_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -26,3 +29,5 @@ void vehicle_destroy(struct vehicle *this_);
 }
 #endif
 
+#endif
+

diff --git a/navit/src/xmlconfig.h b/navit/src/xmlconfig.h
index 036eab5..2e03aa6 100644 (file)
--- a/navit/src/xmlconfig.h
+++ b/navit/src/xmlconfig.h
@@ -1,3 +1,8 @@
+#ifndef NAVIT_XMLCONFIG_H
+#define NAVIT_XMLCONFIG_H
 
 struct container;
 gboolean config_load(char *filename,GError **error);
+
+#endif
+