Merge with modular_map

[navit-package] / src / data.h

diff --git a/src/data.h b/src/data.h
index 61a9e00..e2af6f9 100644 (file)
--- a/src/data.h
+++ b/src/data.h
@@ -1,33 +1,50 @@
-#include "types.h"
-
-static inline u8
+static inline unsigned char
 get_u8(unsigned char **p)
 {
        return *((*p)++);
 }
 
-static inline u16
+static inline unsigned short
 get_u16(unsigned char **p) {
-       u16 ret;
-       ret=*((u16 *)*p);
-       *p+=sizeof(u16);
+       unsigned short ret;
+       ret=*((unsigned short *)*p);
+       *p+=sizeof(unsigned short);
        return ret;
 }
 
-static inline u32
+static inline unsigned short
+get_u16_unal(unsigned char **p) {
+       unsigned short ret;
+       ret=*(*p)++;
+       ret|=(*(*p)++) << 8;
+       return ret;
+}
+
+
+static inline unsigned int
 get_u24(unsigned char **p) {
-       u32 ret;
+       unsigned long ret;
        ret=get_u16(p);
        ret|=*((*p)++) << 16;
        return ret;
 }
 
 
-static inline u32
+static inline unsigned int
 get_u32(unsigned char **p) {
-       u32 ret;
-       ret=*((u32 *)*p);
-       *p+=sizeof(u32);
+       unsigned long ret;
+       ret=*((unsigned int *)*p);
+       *p+=sizeof(unsigned int);
+       return ret;
+}
+
+static inline unsigned int
+get_u32_unal(unsigned char **p) {
+       unsigned long ret;
+       ret=*(*p)++;
+       ret|=(*(*p)++) << 8;
+       ret|=(*(*p)++) << 16;
+       ret|=(*(*p)++) << 24;
        return ret;
 }
 
@@ -38,5 +55,7 @@ get_string(unsigned char **p)
         while (**p) (*p)++;
         (*p)++;
         return ret;
-}
+}      
+
+#define L(x) ({ unsigned char *t=(unsigned char *)&(x); t[0] | (t[1] << 8) | (t[2] << 16) | (t[3] << 24); })