summaryrefslogtreecommitdiff
path: root/navit/maptool
diff options
context:
space:
mode:
authorgeoghegan <geoghegan@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-04-16 17:57:29 +0000
committergeoghegan <geoghegan@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-04-16 17:57:29 +0000
commit8097550faeb9381d9d1cdbcec37f83536cfd88a3 (patch)
tree1226ca20a9a26b833f1541b0808962f6c62da0fe /navit/maptool
parent9d974aa9b0b21d4d06e69ace9fe8c62022ea6083 (diff)
downloadnavit-8097550faeb9381d9d1cdbcec37f83536cfd88a3.tar.gz
Fix:Core: Fixes spurious "array out of bounds" compiler warnings due to bug 35903 in GCC
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4434 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maptool')
-rw-r--r--navit/maptool/maptool.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index d94d0ac16..ccb1a2907 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -178,6 +178,7 @@ int main(int argc, char **argv)
int suffix_count=sizeof(suffixes)/sizeof(char *);
int i;
+ char r[] ="r"; /* Used to make compiler happy due to Bug 35903 in gcc */
main_init(argv[0]);
struct zip_info *zip_info=NULL;
int suffix_start=0;
@@ -551,7 +552,7 @@ int main(int argc, char **argv)
zipnum=zip_get_zipnum(zip_info);
fprintf(stderr,"PROGRESS: Phase 4: generating tiles %s\n",suffix);
tilesdir=tempfile(suffix,"tilesdir",1);
- if (!strcmp(suffix,"r")) {
+ if (!strcmp(suffix,r)) { /* Makes compiler happy due to bug 35903 in gcc */
ch_generate_tiles(suffixes[0],suffix,tilesdir,zip_info);
} else {
for (f = 0 ; f < 3 ; f++)
@@ -597,7 +598,7 @@ int main(int argc, char **argv)
}
index_init(zip_info, 1);
}
- if (!strcmp(suffix,"r")) {
+ if (!strcmp(suffix,r)) { /* Makes compiler happy due to bug 35903 in gcc */
ch_assemble_map(suffixes[0],suffix,zip_info);
} else {
for (f = 0 ; f < 3 ; f++) {