diff options
| author | Max Horn | 2006-07-22 17:28:48 +0000 |
|---|---|---|
| committer | Max Horn | 2006-07-22 17:28:48 +0000 |
| commit | 2859b647026af1a927d1a74100f125bbc0f77db3 (patch) | |
| tree | e842c9e2e67296f5bbc48645ba49b469edb7bd22 /sound/voc.h | |
| parent | 1ffd49604357ed6fd63e133369a89e3b57711ae2 (diff) | |
| download | scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.gz scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.tar.bz2 scummvm-rg350-2859b647026af1a927d1a74100f125bbc0f77db3.zip | |
Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)
svn-id: r23569
Diffstat (limited to 'sound/voc.h')
| -rw-r--r-- | sound/voc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/voc.h b/sound/voc.h index 19879389fc..f725e2b2d8 100644 --- a/sound/voc.h +++ b/sound/voc.h @@ -34,9 +34,7 @@ namespace Audio { class AudioStream; -#if defined(START_PACK_STRUCTS) -#pragma START_PACK_STRUCTS -#endif +#include <common/pack-start.h> // START STRUCT PACKING struct VocFileHeader { uint8 desc[20]; @@ -52,9 +50,7 @@ struct VocBlockHeader { uint8 pack; }; -#if defined(END_PACK_STRUCTS) -#pragma END_PACK_STRUCTS -#endif +#include <common/pack-end.h> // END STRUCT PACKING /** * Take a sample rate parameter as it occurs in a VOC sound header, and |