Codechange: Rearrange struct packing defines and make MinGW use _Pragma pack style

This commit is contained in:
Charles Pigott
2018-06-18 21:21:45 +01:00
committed by Patric Stout
parent 93469a92f2
commit 63898f61b0
4 changed files with 20 additions and 23 deletions

View File

@@ -102,21 +102,19 @@ private:
bool ReadDLSWave(FILE *f, DWORD list_length, long offset);
};
#pragma pack(2)
/** A RIFF chunk header. */
struct ChunkHeader {
PACK_N(struct ChunkHeader {
FOURCC type; ///< Chunk type.
DWORD length; ///< Length of the chunk, not including the chunk header itself.
};
}, 2);
/** Buffer format for a DLS wave download. */
struct WAVE_DOWNLOAD {
PACK_N(struct WAVE_DOWNLOAD {
DMUS_DOWNLOADINFO dlInfo;
ULONG ulOffsetTable[2];
DMUS_WAVE dmWave;
DMUS_WAVEDATA dmWaveData;
};
#pragma pack()
}, 2);
struct PlaybackSegment {
uint32 start, end;