Fix:core: Change structure members order to be alligned|

To check compile with -Wpadded

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

diff --git a/navit/file.c b/navit/file.c
index d758e8e..59bdebe 100644 (file)
--- a/navit/file.c
+++ b/navit/file.c
@@ -48,10 +48,10 @@ static int file_name_id;
 static struct cache *file_cache;
 
 struct file_cache_id {
-       long long offset;
        int size;
        int file_name_id;
        int method;
+       long long offset;
 };
 
 struct file *

diff --git a/navit/file.h b/navit/file.h
index 7c811aa..79f211d 100644 (file)
--- a/navit/file.h
+++ b/navit/file.h
@@ -29,10 +29,10 @@
 #include "param.h"
 
 struct file {
+       struct file *next;
        unsigned char *begin;
        unsigned char *end;
        long long size;
-       char *name;
        int name_id;
        int fd;
 #ifndef __CEGCC__
@@ -44,7 +44,7 @@ struct file {
        long map_handle;
        long map_file;
 #endif
-       struct file *next;
+       char *name;
 };
 
 /* prototypes */

diff --git a/navit/transform.c b/navit/transform.c
index 47d8f99..39b089f 100644 (file)
--- a/navit/transform.c
+++ b/navit/transform.c
@@ -33,14 +33,14 @@
 #include "item.h"
 
 struct transformation {
-       long scale;             /* Scale factor */
        int angle;              /* Rotation angle */
        double cos_val,sin_val; /* cos and sin of rotation angle */
-       enum projection pro;
        struct map_selection *map_sel;
        struct map_selection *screen_sel;
        struct point screen_center;
        struct coord map_center;        /* Center of source rectangle */
+       enum projection pro;
+       long scale;             /* Scale factor */
 };
 
 struct transformation *