diff options
-rw-r--r-- | navit/maptool/osm.c | 4 | ||||
-rw-r--r-- | navit/maptool/osm_o5m.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index 2b2884977..59518d620 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -931,7 +931,7 @@ item_bin_get_nodeid(struct item_bin *ib) osmid item_bin_get_wayid(struct item_bin *ib) { - long long *ret=item_bin_get_attr(ib, attr_osm_wayid, NULL); + unsigned long long *ret=item_bin_get_attr(ib, attr_osm_wayid, NULL); if (ret) return *ret; return 0; @@ -1415,7 +1415,7 @@ clear_node_item_buffer(void) } } -static unsigned long long +static long long node_item_find_index_in_ordered_list(osmid id) { struct node_item *node_buffer_base=(struct node_item *)(node_buffer.base); diff --git a/navit/maptool/osm_o5m.c b/navit/maptool/osm_o5m.c index 96a5f7ba7..d6957067d 100644 --- a/navit/maptool/osm_o5m.c +++ b/navit/maptool/osm_o5m.c @@ -16,7 +16,7 @@ struct o5m { int error; int lat, lon, uid, version; - long long id, rid[3], changeset; + unsigned long long id, rid[3], changeset; time_t timestamp; char *user; }; @@ -61,7 +61,7 @@ get_uval(unsigned char **p) } } -static unsigned long long +static long long get_sval(unsigned char **p) { unsigned long long ret=get_uval(p); |