diff options
| -rw-r--r-- | navit/event.c | 2 | ||||
| -rw-r--r-- | navit/event.h | 2 | ||||
| -rw-r--r-- | navit/file.c | 2 | ||||
| -rw-r--r-- | navit/file.h | 2 | ||||
| -rw-r--r-- | navit/graphics/sdl/graphics_sdl.c | 2 | ||||
| -rw-r--r-- | navit/maptool/maptool.h | 2 | ||||
| -rw-r--r-- | navit/maptool/misc.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/navit/event.c b/navit/event.c index 611579f02..9ba5d17a5 100644 --- a/navit/event.c +++ b/navit/event.c @@ -93,7 +93,7 @@ event_call_callback(struct callback_list *cb) event_methods.call_callback(cb); } -char * +char const * event_system(void) { return e_system; diff --git a/navit/event.h b/navit/event.h index 0b5aeb53e..b67bcbd7d 100644 --- a/navit/event.h +++ b/navit/event.h @@ -64,7 +64,7 @@ void event_remove_timeout(struct event_timeout *ev); struct event_idle *event_add_idle(int priority, struct callback *cb); void event_remove_idle(struct event_idle *ev); void event_call_callback(struct callback_list *cb); -char *event_system(void); +char const *event_system(void); int event_request_system(const char *system, const char *requestor); /* end of prototypes */ #ifdef __cplusplus diff --git a/navit/file.c b/navit/file.c index 6e2b5a330..9ebdc9846 100644 --- a/navit/file.c +++ b/navit/file.c @@ -659,7 +659,7 @@ file_data_free(struct file *file, unsigned char *data) } int -file_exists(char *name) +file_exists(char const *name) { struct stat buf; if (! stat(name, &buf)) diff --git a/navit/file.h b/navit/file.h index c07da9ba3..2632ccc69 100644 --- a/navit/file.h +++ b/navit/file.h @@ -78,7 +78,7 @@ int file_get_contents(char *name, unsigned char **buffer, int *size); unsigned char *file_data_read_compressed(struct file *file, long long offset, int size, int size_uncomp); unsigned char *file_data_read_encrypted(struct file *file, long long offset, int size, int size_uncomp, int compressed, char *passwd); void file_data_free(struct file *file, unsigned char *data); -int file_exists(char *name); +int file_exists(char const *name); void file_remap_readonly(struct file *f); void file_unmap(struct file *f); void *file_opendir(char *dir); diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c index 4ac654e85..ba35075bd 100644 --- a/navit/graphics/sdl/graphics_sdl.c +++ b/navit/graphics/sdl/graphics_sdl.c @@ -1247,7 +1247,7 @@ static int window_fullscreen(struct window *win, int on) } static void * -get_data(struct graphics_priv *this, const char *type) +get_data(struct graphics_priv *this, char const *type) { if(strcmp(type, "window") == 0) { struct window *win; diff --git a/navit/maptool/maptool.h b/navit/maptool/maptool.h index 94092d41b..748b0cbc6 100644 --- a/navit/maptool/maptool.h +++ b/navit/maptool/maptool.h @@ -206,7 +206,7 @@ void bbox(struct coord *c, int count, struct rect *r); int contains_bbox(int xl, int yl, int xh, int yh, struct rect *r); int bbox_contains_coord(struct rect *r, struct coord *c); int bbox_contains_bbox(struct rect *out, struct rect *in); -long long bbox_area(struct rect *r); +long long bbox_area(struct rect const *r); void phase1_map(GList *maps, FILE *out_ways, FILE *out_nodes); void dump(FILE *in); int phase4(FILE **in, int in_count, int with_range, char *suffix, FILE *tilesdir_out, struct zip_info *zip_info); diff --git a/navit/maptool/misc.c b/navit/maptool/misc.c index 1d5f70b98..bdf8ec070 100644 --- a/navit/maptool/misc.c +++ b/navit/maptool/misc.c @@ -121,7 +121,7 @@ bbox_contains_bbox(struct rect *out, struct rect *in) } long long -bbox_area(struct rect *r) +bbox_area(struct rect const *r) { return ((long long)r->h.x-r->l.x)*(r->h.y-r->l.y); } |