1.1 --- a/librazor/razor-internal.h	Fri Jul 03 18:02:33 2009 +0100
     1.2 +++ b/librazor/razor-internal.h	Mon Jul 06 18:19:13 2009 +0100
     1.3 @@ -37,8 +37,8 @@
     1.4  #endif
     1.5  
     1.6  #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
     1.7 -#define ALIGN(value, base) (((value) + (base - 1)) & ~((base) - 1))
     1.8 -
     1.9 +#define PADDING(value, base) (-(value) & (base - 1))
    1.10 +#define ALIGN(value, base) ((value) + PADDING(value, base))
    1.11  void *zalloc(size_t size);
    1.12  
    1.13  struct razor_set_section {
    1.14 @@ -118,15 +118,7 @@
    1.15   	struct array prefix_pool;
    1.16  	struct array file_string_pool;
    1.17  	struct array details_string_pool;
    1.18 -
    1.19 -	struct razor_set_header *header;
    1.20 -	size_t header_size;
    1.21 -
    1.22 -	struct razor_set_header *details_header;
    1.23 -	size_t details_header_size;
    1.24 -
    1.25 -	struct razor_set_header *files_header;
    1.26 -	size_t files_header_size;
    1.27 +	struct razor_mapped_file *mapped_files;
    1.28  };
    1.29  
    1.30  struct import_entry {