Fix:Tools:Fixed osm2navit to work on 64 Bit again
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Tue, 26 Feb 2008 18:29:46 +0000 (18:29 +0000)
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Tue, 26 Feb 2008 18:29:46 +0000 (18:29 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@914 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/src/osm2navit.c

index 14d7777..be847a2 100644 (file)
@@ -888,7 +888,7 @@ sort_countries(void)
                if (co->size) {
                        buffer=malloc(co->size);
                        assert(buffer != NULL);
-                       idx=malloc(co->count*4);
+                       idx=malloc(co->count*sizeof(void *));
                        assert(idx != NULL);
                        name=g_strdup_printf("country_%d.bin.unsorted", co->countryid);
                        f=fopen(name,"r");
@@ -902,7 +902,7 @@ sort_countries(void)
                                idx[j]=p;
                                p+=(*((int *)p)+1)*4;
                        }
-                       qsort(idx, co->count, 4, sort_countries_compare);
+                       qsort(idx, co->count, sizeof(void *), sort_countries_compare);
                        name=g_strdup_printf("country_%d.bin", co->countryid);
                        f=fopen(name,"w");
                        for (j = 0 ; j < co->count ; j++) {