diff options
| author | zaxl <zaxl@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-11-08 19:31:47 +0000 |
|---|---|---|
| committer | zaxl <zaxl@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-11-08 19:31:47 +0000 |
| commit | 8672a2b259805117d5a85cb80584638d27370ff8 (patch) | |
| tree | e086dc746c43d86afc0bfd4f70e0a47a5d70d9a8 | |
| parent | 71befebe28bcb95ff1c8001bff98986987aff9e8 (diff) | |
| download | navit-8672a2b259805117d5a85cb80584638d27370ff8.tar.gz | |
Fix:core: Change structure members order to be alligned|
To check compile with -Wpadded
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1701 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | navit/file.c | 2 | ||||
| -rw-r--r-- | navit/file.h | 4 | ||||
| -rw-r--r-- | navit/transform.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/navit/file.c b/navit/file.c index d758e8ea2..59bdebe28 100644 --- 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 7c811aa1c..79f211d1c 100644 --- 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 47d8f99df..39b089f0e 100644 --- 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 * |