Updated for SDL gui /C++ compliancesdl

git-svn-id: http://svn.code.sf.net/p/navit/code/branches/sdl/navit@186 ffa7fe5e-494d-0410-b361-a75ebd5db220

5 files changed, 56 insertions, 0 deletions

diff --git a/src/country.h b/src/country.h
index 616a6c26..9fb44363 100644
--- a/src/country.h
+++ b/src/country.h
@@ -6,7 +6,23 @@ struct country {
 	char *name;
 };
 struct country * country_get_by_id(int id);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int country_search_by_name(const char *name, int partial, int (*func)(struct country *cou, void *data), void *data);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int country_search_by_car(const char *name, int partial, int (*func)(struct country *cou, void *data), void *data);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int country_search_by_iso2(const char *name, int partial, int (*func)(struct country *cou, void *data), void *data);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int country_search_by_iso3(const char *name, int partial, int (*func)(struct country *cou, void *data), void *data);
diff --git a/src/street.h b/src/street.h
index a0b5cdbb..7af1bfc1 100644
--- a/src/street.h
+++ b/src/street.h
@@ -49,12 +49,21 @@ struct street_coord {
 
 
 void street_draw_block(struct block_info *blk_inf, unsigned char *start, unsigned char *end, void *data);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 struct street_coord *street_coord_get(struct block_info *blk_inf, struct street_str *str);
+
 struct street_coord_handle * street_coord_handle_new(struct block_info *blk_inf, struct street_str *str);
 void street_coord_handle_rewind(struct street_coord_handle *h);
 int street_coord_handle_get(struct street_coord_handle *h, struct coord *c, int count);
 void street_coord_handle_destroy(struct street_coord_handle *handle);
 void street_get_block(struct map_data *mdata, struct transformation *t, void (*callback)(void *data), void *data);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int street_get_by_id(struct map_data *mdat, int country, int id, struct block_info *res_blk_inf, struct street_str **res_str);
 void street_bti_draw_block(struct block_info *blk_inf, unsigned char *start, unsigned char *end, void *data);
 int street_get_param(struct segment *seg, struct param_list *param, int count, int verbose);
diff --git a/src/street_name.h b/src/street_name.h
index 5d74194f..502cbff8 100644
--- a/src/street_name.h
+++ b/src/street_name.h
@@ -44,9 +44,25 @@ struct street_name_number_info {
 	struct street_name_segment *segment;
 };
 
+#ifdef __cplusplus
+extern "C"
+#endif
 int street_name_get_by_id(struct street_name *name, struct map_data *mdat, unsigned long id);
+
 void street_name_get(struct street_name *name, unsigned char **p);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int street_name_search(struct map_data *mdat, int country, int town_assoc, const char *name, int partial, int (*func)(struct street_name *name, void *data), void *data);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int street_name_get_info(struct street_name_info *inf, struct street_name *name);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int street_name_get_number_info(struct street_name_number_info *num, struct street_name_info *inf);
 
diff --git a/src/town.h b/src/town.h
index 46513272..03fde864 100644
--- a/src/town.h
+++ b/src/town.h
@@ -27,8 +27,18 @@ struct map_data;
 void town_draw_block(struct block_info *blk_inf, unsigned char *start, unsigned char *end, void *data);
 int town_get_param(struct segment *seg, struct param_list *param, int count);
 int town_search_by_postal_code(struct map_data *mdat, int country, const char *name, int partial, int (*func)(struct town *, void *data), void *data);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 int town_search_by_name(struct map_data *mdat, int country, const char *name, int partial, int (*func)(struct town *, void *data), void *data);
+
 int town_search_by_district(struct map_data *mdat, int country, const char *name, int partial, int (*func)(struct town *, void *data), void *data);
 int town_search_by_name_phon(struct map_data *mdat, int country, const char *name, int partial, int (*func)(struct town *, void *data), void *data);
 int town_search_by_district_phon(struct map_data *mdat, int country, const char *name, int partial, int (*func)(struct town *, void *data), void *data);
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
 void town_get_by_id(struct town *town, struct map_data *mdat, int country, int id);
diff --git a/src/transform.h b/src/transform.h
index f2099d25..24cb0887 100644
--- a/src/transform.h
+++ b/src/transform.h
@@ -30,7 +30,12 @@ int is_point_visible(struct transformation *t, struct coord *c);
 int transform_get_scale(struct transformation *t);
 void transform_setup_source_rect(struct transformation *t);
 void transform_set_angle(struct transformation *t,int angle);
+
+#ifdef __cplusplus
+extern "C"
+#endif
 void transform_setup(struct transformation *t, int x, int y, int scale, int angle);
+
 void transform_setup_source_rect_limit(struct transformation *t, struct coord *center, int limit);
 void transform_geo_text(struct coord_geo *g, char *buffer);
 void transform_limit_extend(struct coord *rect, struct coord *c);