With Microsoft printf library the format for long long type is %I64d and not %Ld

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

3 files changed, 10 insertions, 10 deletions

diff --git a/maptool/misc.c b/maptool/misc.c
index 1aeaac74..bf77b1f9 100644
--- a/maptool/misc.c
+++ b/maptool/misc.c
@@ -298,10 +298,10 @@ phase5(FILE **in, FILE **references, int in_count, char *suffix, struct zip_info
 	th=tile_head_root;
 	size=0;
 	slices=0;
-	fprintf(stderr, "Maximum slice size %Ld\n", slice_size);
+	fprintf(stderr, "Maximum slice size "LONGLONG_FMT"\n", slice_size);
 	while (th) {
 		if (size + th->total_size > slice_size) {
-			fprintf(stderr,"Slice %d is of size %Ld\n", slices, size);
+			fprintf(stderr,"Slice %d is of size "LONGLONG_FMT"\n", slices, size);
 			size=0;
 			slices++;
 		}
@@ -309,7 +309,7 @@ phase5(FILE **in, FILE **references, int in_count, char *suffix, struct zip_info
 		th=th->next;
 	}
 	if (size)
-		fprintf(stderr,"Slice %d is of size %Ld\n", slices, size);
+		fprintf(stderr,"Slice %d is of size "LONGLONG_FMT"\n", slices, size);
 	th=tile_head_root;
 	size=0;
 	slices=0;
diff --git a/maptool/osm.c b/maptool/osm.c
index 34b596a3..9d30d770 100644
--- a/maptool/osm.c
+++ b/maptool/osm.c
@@ -553,7 +553,7 @@ osm_warning(char *type, long long id, int cont, char *fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(str, sizeof(str), fmt, ap);
 	va_end(ap);
-	fprintf(stderr,"%shttp://www.openstreetmap.org/browse/%s/%Ld %s",cont ? "":"OSM Warning:",type,id,str);
+	fprintf(stderr,"%shttp://www.openstreetmap.org/browse/%s/"LONGLONG_FMT" %s",cont ? "":"OSM Warning:",type,id,str);
 }
 
 static void
@@ -1494,7 +1494,7 @@ static int
 get_relation_member(char *str, struct relation_member *memb)
 {
 	int len;
-	sscanf(str,"%d:%Ld:%n",&memb->type,&memb->id,&len);
+	sscanf(str,"%d:"LONGLONG_FMT":%n",&memb->type,&memb->id,&len);
 	memb->role=str+len;
 	return 1;
 }
@@ -1609,7 +1609,7 @@ get_way(FILE *way, FILE *ways_index, struct coord *c, long long wayid, struct it
 	while (item_bin_read(ret, way)) {
 		currid=item_bin_get_wayid(ret);
 		if (debug)
-			fprintf(stderr,"%Ld:",currid);
+			fprintf(stderr,LONGLONG_FMT":",currid);
 		if (currid != wayid) 
 			return NULL;
 		ic=(struct coord *)(ret+1);
@@ -1703,9 +1703,9 @@ process_turn_restrictions(FILE *in, FILE *coords, FILE *ways, FILE *ways_index,
 				
 		}
 #if 0
-		fprintf(stderr,"via %Ld vs %d\n",viam.id, ni.id);
+		fprintf(stderr,"via "LONGLONG_FMT" vs %d\n",viam.id, ni.id);
 		fprintf(stderr,"coord 0x%x,0x%x\n",ni.c.x,ni.c.y);	
-		fprintf(stderr,"Lookup %Ld\n",fromm.id);
+		fprintf(stderr,"Lookup "LONGLONG_FMT"\n",fromm.id);
 #endif
 		if (!(fromc=get_way(ways, ways_index, viafrom, fromm.id, from, 0))) {
 			if (viam.type == 1 || !(fromc=get_way(ways, ways_index, viato, fromm.id, from, 0))) {
@@ -1778,7 +1778,7 @@ process_countries(FILE *way, FILE *ways_index)
 		if (!seg) {
 			fprintf(stderr,"is null\n");
 		} else {
-			fprintf(stderr,"segment %p %s area %Ld\n",sort_segments,coord_is_equal(*seg->first, *seg->last) ? "closed":"open",geom_poly_area(seg->first,seg->last-seg->first+1));
+			fprintf(stderr,"segment %p %s area "LONGLONG_FMT"\n",sort_segments,coord_is_equal(*seg->first, *seg->last) ? "closed":"open",geom_poly_area(seg->first,seg->last-seg->first+1));
 		}
 #if 0
 		int count=seg->last-seg->first+1;
diff --git a/maptool/tile.c b/maptool/tile.c
index 7c5bd39b..4e5d2b85 100644
--- a/maptool/tile.c
+++ b/maptool/tile.c
@@ -169,7 +169,7 @@ tile_extend(char *tile, struct item_bin *ib, GList **tiles_list)
 {
 	struct tile_head *th=NULL;
 	if (debug_tile(tile))
-		fprintf(stderr,"Tile:Writing %d bytes to '%s' (%p,%p) 0x%x %Ld\n", (ib->len+1)*4, tile, g_hash_table_lookup(tile_hash, tile), tile_hash2 ? g_hash_table_lookup(tile_hash2, tile) : NULL, ib->type, item_bin_get_id(ib));
+		fprintf(stderr,"Tile:Writing %d bytes to '%s' (%p,%p) 0x%x "LONGLONG_FMT"\n", (ib->len+1)*4, tile, g_hash_table_lookup(tile_hash, tile), tile_hash2 ? g_hash_table_lookup(tile_hash2, tile) : NULL, ib->type, item_bin_get_id(ib));
 	if (tile_hash2)
 		th=g_hash_table_lookup(tile_hash2, tile);
 	if (!th)