More amd64 fixes to make it actually work

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@112 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/block.c b/navit/src/block.c
index 3e77431..0c7d0f2 100644 (file)
--- a/navit/src/block.c
+++ b/navit/src/block.c
@@ -12,14 +12,14 @@ struct file_private {
 };
 
 struct block_index_item {
-       unsigned long blocknum;
-       unsigned long blocks;
+       u32 blocknum;
+       u32 blocks;
 };
 
 struct block_index {
-       unsigned long blocks;
-        unsigned long size;
-        unsigned long next;      
+       u32 blocks;
+        u32 size;
+        u32 next;      
        struct block_index_item list[0];
 };
 

diff --git a/navit/src/block.h b/navit/src/block.h
index a65fe93..ddc7426 100644 (file)
--- a/navit/src/block.h
+++ b/navit/src/block.h
@@ -2,9 +2,9 @@
 #include "transform.h"
 
 struct block {
-       unsigned long blocks;
-       unsigned long size;
-       unsigned long next;
+       u32 blocks;
+       u32 size;
+       u32 next;
        struct coord c[2];
        int count;
 };

diff --git a/navit/src/coord.h b/navit/src/coord.h
index 54ba4b7..550c032 100644 (file)
--- a/navit/src/coord.h
+++ b/navit/src/coord.h
@@ -1,10 +1,12 @@
 #ifndef COORD_H
 #define COORD_H
 
+#include "types.h"
+
 /*! A integer mercator coordinate */
 struct coord {
-       long x; /*!< X-Value */
-       long y; /*!< Y-Value */
+       s32 x; /*!< X-Value */
+       s32 y; /*!< Y-Value */
 };
 
 //! A double mercator coordinate

diff --git a/navit/src/poly.c b/navit/src/poly.c
index e39ecc5..4fb8514 100644 (file)
--- a/navit/src/poly.c
+++ b/navit/src/poly.c
@@ -26,9 +26,9 @@ poly_get_hdr(unsigned char **p,struct poly_hdr *poly_hdr)
        (*p)++;
        poly_hdr->order=*(*p)++;
        poly_hdr->type=*(*p)++;
-       poly_hdr->polys=*(unsigned long *)(*p); (*p)+=sizeof(unsigned long);
-       poly_hdr->count=(unsigned long *)(*p); (*p)+=poly_hdr->polys*sizeof(unsigned long);
-       poly_hdr->count_sum=*(unsigned long *)(*p); (*p)+=sizeof(unsigned long);
+       poly_hdr->polys=*(u32 *)(*p); (*p)+=sizeof(u32);
+       poly_hdr->count=(u32 *)(*p); (*p)+=poly_hdr->polys*sizeof(u32);
+       poly_hdr->count_sum=*(u32 *)(*p); (*p)+=sizeof(u32);
        return 0;
 }
 

diff --git a/navit/src/poly.h b/navit/src/poly.h
index 8d735f5..9d9dcbf 100644 (file)
--- a/navit/src/poly.h
+++ b/navit/src/poly.h
@@ -4,9 +4,9 @@ struct poly_hdr {
        char *name;
        unsigned char order;
        unsigned char type;
-       unsigned long polys;
-       unsigned long *count;
-       unsigned long count_sum;
+       u32 polys;
+       u32 *count;
+       u32 count_sum;
 };
 
 void poly_draw_block(struct block_info *blk_inf, unsigned char *p, unsigned char *end, void *data);