|
|
|
@@ -33,41 +33,10 @@ |
|
|
|
|
|
|
|
#define MEM_ALIGN(x,y) x __attribute__((aligned(y))) |
|
|
|
|
|
|
|
#define PRE_PACKED_STRUCTURE |
|
|
|
#ifndef POST_PACKED_STRUCTURE |
|
|
|
/* POST_PACKED_STRUCTURE needs to be a macro which |
|
|
|
expands into a compiler directive. The directive must |
|
|
|
tell the compiler to arrange the preceding structure |
|
|
|
declaration so that it is packed on byte-boundaries rather |
|
|
|
than use the natural alignment of the processor and/or |
|
|
|
compiler. |
|
|
|
*/ |
|
|
|
#define POST_PACKED_STRUCTURE __attribute__((__packed__)) |
|
|
|
#endif |
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
#define MEM_ALIGN(x,y) x |
|
|
|
|
|
|
|
#ifdef _MSC_VER |
|
|
|
#define PRE_PACKED_STRUCTURE1 __pragma(pack(push,1)) |
|
|
|
#define PRE_PACKED_STRUCTURE PRE_PACKED_STRUCTURE1 |
|
|
|
/* PRE_PACKED_STRUCTURE needs to be a macro which |
|
|
|
expands into a compiler directive. The directive must |
|
|
|
tell the compiler to arrange the following structure |
|
|
|
declaration so that it is packed on byte-boundaries rather |
|
|
|
than use the natural alignment of the processor and/or |
|
|
|
compiler. |
|
|
|
*/ |
|
|
|
#define POST_PACKED_STRUCTURE ;__pragma(pack(pop)) |
|
|
|
/* and POST_PACKED_STRUCTURE needs to be a macro which |
|
|
|
restores the packing to its previous setting */ |
|
|
|
#else |
|
|
|
/* Other Windows compilers to go here */ |
|
|
|
#define PRE_PACKED_STRUCTURE |
|
|
|
#define POST_PACKED_STRUCTURE |
|
|
|
#endif |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
#if defined(_MSC_VER) /* Added by JE - 31-01-2012 */ |
|
|
|
|