diff options
| -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 * |