diff options
| -rw-r--r-- | navit/coord.h | 9 | ||||
| -rw-r--r-- | navit/linguistics.h | 7 | ||||
| -rw-r--r-- | navit/map.h | 7 | ||||
| -rw-r--r-- | navit/mapset.h | 11 | ||||
| -rw-r--r-- | navit/track.h | 4 | ||||
| -rw-r--r-- | navit/vehicleprofile.h | 7 |
6 files changed, 39 insertions, 6 deletions
diff --git a/navit/coord.h b/navit/coord.h index a8221fa23..8d08c0353 100644 --- a/navit/coord.h +++ b/navit/coord.h @@ -20,6 +20,10 @@ #ifndef NAVIT_COORD_H #define NAVIT_COORD_H + +#ifdef __cplusplus +extern "C" { +#endif #include <stdio.h> #include "config.h" #include "projection.h" @@ -131,7 +135,6 @@ int coord_rect_contains(struct coord_rect *r, struct coord *c); void coord_rect_extend(struct coord_rect *r, struct coord *c); void coord_format(float lat,float lng, enum coord_format, char * buffer, int size); -#endif /* prototypes */ enum coord_format; enum projection; @@ -155,3 +158,7 @@ void coord_format(float lat, float lng, enum coord_format fmt, char *buffer, int unsigned int coord_hash(const void *key); int coord_equal(const void *a, const void *b); /* end of prototypes */ +#ifdef __cplusplus +} +#endif +#endif diff --git a/navit/linguistics.h b/navit/linguistics.h index 5fe534f19..e3e52c2ee 100644 --- a/navit/linguistics.h +++ b/navit/linguistics.h @@ -1,4 +1,9 @@ +#ifdef __cplusplus +extern "C" { +#endif char *linguistics_expand_special(char *str, int mode); char *linguistics_next_word(char *str); void linguistics_init(void); - +#ifdef __cplusplus +} +#endif diff --git a/navit/map.h b/navit/map.h index dda18e16c..a1b8f1dcf 100644 --- a/navit/map.h +++ b/navit/map.h @@ -28,6 +28,10 @@ #ifndef NAVIT_MAP_H #define NAVIT_MAP_H +#ifdef __cplusplus +extern "C" { +#endif + struct map_priv; struct attr; #include "coord.h" @@ -261,4 +265,7 @@ void map_dump_file(struct map *map, const char *file); void map_dump(struct map *map); /* end of prototypes */ +#ifdef __cplusplus +} +#endif #endif diff --git a/navit/mapset.h b/navit/mapset.h index 9ad794255..6f3be40e7 100644 --- a/navit/mapset.h +++ b/navit/mapset.h @@ -20,6 +20,10 @@ #ifndef NAVIT_MAPSET_H #define NAVIT_MAPSET_H +#ifdef __cplusplus +extern "C" { +#endif + /* prototypes */ enum attr_type; struct attr; @@ -39,7 +43,10 @@ struct mapset_handle *mapset_open(struct mapset *ms); struct map *mapset_next(struct mapset_handle *msh, int active); 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); +struct item *mapset_search_get_item(struct mapset_search *this_); +void mapset_search_destroy(struct mapset_search *this_); /* end of prototypes */ +#ifdef __cplusplus +} +#endif #endif diff --git a/navit/track.h b/navit/track.h index 8a8e085ee..bd68a59b1 100644 --- a/navit/track.h +++ b/navit/track.h @@ -47,8 +47,8 @@ struct item *tracking_get_current_item(struct tracking *_this); int *tracking_get_current_flags(struct tracking *_this); void tracking_update(struct tracking *tr, struct vehicle *v, struct vehicleprofile *vehicleprofile, enum projection pro); struct tracking *tracking_new(struct attr *parent, struct attr **attrs); -void tracking_set_mapset(struct tracking *this, struct mapset *ms); -void tracking_set_route(struct tracking *this, struct route *rt); +void tracking_set_mapset(struct tracking *_this, struct mapset *ms); +void tracking_set_route(struct tracking *_this, struct route *rt); void tracking_destroy(struct tracking *tr); struct map *tracking_get_map(struct tracking *this_); void tracking_init(void); diff --git a/navit/vehicleprofile.h b/navit/vehicleprofile.h index 209815ec8..3765af944 100644 --- a/navit/vehicleprofile.h +++ b/navit/vehicleprofile.h @@ -17,6 +17,10 @@ * Boston, MA 02110-1301, USA. */ + +#ifdef __cplusplus +extern "C" { +#endif struct vehicleprofile { int mode; /**< 0 = Auto, 1 = On-Road, 2 = Off-Road */ int flags_forward_mask; /**< Flags mask for moving in positive direction */ @@ -39,3 +43,6 @@ struct roadprofile * vehicleprofile_get_roadprofile(struct vehicleprofile *this_ //! Returns the vehicle profile's name. char * vehicleprofile_get_name(struct vehicleprofile *this_); +#ifdef __cplusplus +} +#endif |