diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-23 18:44:39 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-23 18:44:39 +0000 |
| commit | 7de15581398bea00e0f593e4c182caf2e87e320c (patch) | |
| tree | acda860b8411b8e07f5bf26b7f3c19e94eec1761 /navit | |
| parent | 1f655c508dc1481f4fa6559b7dc598cf7d6a911b (diff) | |
| download | navit-7de15581398bea00e0f593e4c182caf2e87e320c.tar.gz | |
Fix:maptool:Fix boundaries issue on win32
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5034 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/maptool/boundaries.c | 2 | ||||
| -rw-r--r-- | navit/maptool/osm_o5m.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/navit/maptool/boundaries.c b/navit/maptool/boundaries.c index 19c57c9f8..ed8b90ce3 100644 --- a/navit/maptool/boundaries.c +++ b/navit/maptool/boundaries.c @@ -89,7 +89,7 @@ process_boundaries_setup(FILE *boundaries, struct relations *relations) while ((member=item_bin_get_attr(ib, attr_osm_member, member))) { long long wayid; int read=0; - if (sscanf(member,"2:%Ld:%n",&wayid,&read) >= 1) { + if (sscanf(member,"2:"LONGLONG_FMT":%n",&wayid,&read) >= 1) { char *rolestr=member+read; enum geom_poly_segment_type role; if (!strcmp(rolestr,"outer") || !strcmp(rolestr,"exclave")) diff --git a/navit/maptool/osm_o5m.c b/navit/maptool/osm_o5m.c index f988848a2..d418c97c5 100644 --- a/navit/maptool/osm_o5m.c +++ b/navit/maptool/osm_o5m.c @@ -144,7 +144,7 @@ o5m_reset(struct o5m *o) static void o5m_print_start(struct o5m *o, int c) { - printf("\t<%s id=\"%Ld\"",types[c-0x10],o->id); + printf("\t<%s id=\""LONGLONG_FMT"\"",types[c-0x10],o->id); } static void @@ -153,7 +153,7 @@ o5m_print_version(struct o5m *o, int tags) char timestamp_str[64]; if (o->version) { strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%dT%H:%M:%SZ", gmtime(&o->timestamp)); - printf(" version=\"%d\" timestamp=\"%s\" changeset=\"%Ld\"",o->version,timestamp_str,o->changeset); + printf(" version=\"%d\" timestamp=\"%s\" changeset=\""LONGLONG_FMT"\"",o->version,timestamp_str,o->changeset); if (o->uid) { printf(" uid=\"%d\" user=\"",o->uid); print_escaped(o->user); @@ -249,8 +249,8 @@ map_collect_data_osm_o5m(FILE *in, struct maptool_osm *osm) while (o.buffer_start < rend) { o.rid[0]+=get_sval(&o.buffer_start); osm_add_nd(o.rid[0]); - if (print) - printf("\t\t<nd ref=\"%Ld\"/>\n",o.rid[0]); + if (print) + printf("\t\t<nd ref=\""LONGLONG_FMT"\"/>\n",o.rid[0]); } break; case 0x12: @@ -276,7 +276,7 @@ map_collect_data_osm_o5m(FILE *in, struct maptool_osm *osm) o.rid[r]+=delta; osm_add_member(r+1, o.rid[r], role+1); if (print) - printf("\t\t<member type=\"%s\" ref=\"%Ld\" role=\"%s\"/>\n",types[r], o.rid[r], role+1); + printf("\t\t<member type=\"%s\" ref=\""LONGLONG_FMT"\" role=\"%s\"/>\n",types[r], o.rid[r], role+1); } break; } |