diff options
Diffstat (limited to 'include/sound/wavefront.h')
| -rw-r--r-- | include/sound/wavefront.h | 30 | 
1 files changed, 15 insertions, 15 deletions
diff --git a/include/sound/wavefront.h b/include/sound/wavefront.h index 9e572aed243..15d82e594b5 100644 --- a/include/sound/wavefront.h +++ b/include/sound/wavefront.h @@ -454,22 +454,22 @@ typedef struct wf_multisample {  } wavefront_multisample;  typedef struct wf_alias { -    s16 OriginalSample __attribute__ ((packed)); +    s16 OriginalSample; -    struct wf_sample_offset sampleStartOffset __attribute__ ((packed)); -    struct wf_sample_offset loopStartOffset __attribute__ ((packed)); -    struct wf_sample_offset sampleEndOffset __attribute__ ((packed)); -    struct wf_sample_offset loopEndOffset __attribute__ ((packed)); +    struct wf_sample_offset sampleStartOffset; +    struct wf_sample_offset loopStartOffset; +    struct wf_sample_offset sampleEndOffset; +    struct wf_sample_offset loopEndOffset; -    s16  FrequencyBias __attribute__ ((packed)); +    s16  FrequencyBias; -    u8 SampleResolution:2  __attribute__ ((packed)); -    u8 Unused1:1  __attribute__ ((packed)); -    u8 Loop:1 __attribute__ ((packed)); -    u8 Bidirectional:1  __attribute__ ((packed)); -    u8 Unused2:1 __attribute__ ((packed)); -    u8 Reverse:1 __attribute__ ((packed)); -    u8 Unused3:1 __attribute__ ((packed));  +    u8 SampleResolution:2; +    u8 Unused1:1; +    u8 Loop:1; +    u8 Bidirectional:1; +    u8 Unused2:1; +    u8 Reverse:1; +    u8 Unused3:1;      /* This structure is meant to be padded only to 16 bits on their         original. Of course, whoever wrote their documentation didn't @@ -480,8 +480,8 @@ typedef struct wf_alias {         standard 16->32 bit issues.      */ -    u8 sixteen_bit_padding __attribute__ ((packed)); -} wavefront_alias; +    u8 sixteen_bit_padding; +} __attribute__((packed)) wavefront_alias;  typedef struct wf_drum {      u8 PatchNumber;  |