Mercurial > mplayer.hg
diff libmpdemux/ms_hdr.h @ 26109:e53dac3c60ee
Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately
these identifiers appear in Windows system headers and are thus outside our
direct control.
author | diego |
---|---|
date | Sun, 02 Mar 2008 19:38:50 +0000 |
parents | d5641be6a896 |
children | 69d26a2ce817 |
line wrap: on
line diff
--- a/libmpdemux/ms_hdr.h Sat Mar 01 20:09:22 2008 +0000 +++ b/libmpdemux/ms_hdr.h Sun Mar 02 19:38:50 2008 +0000 @@ -1,9 +1,9 @@ #ifndef MPLAYER_MS_HDR_H #define MPLAYER_MS_HDR_H -#ifndef WAVEFORMATEX_ -#define WAVEFORMATEX_ -typedef struct __attribute__((__packed__)) WAVEFORMATEX { +#ifndef _WAVEFORMATEX_ +#define _WAVEFORMATEX_ +typedef struct __attribute__((__packed__)) _WAVEFORMATEX { unsigned short wFormatTag; unsigned short nChannels; unsigned int nSamplesPerSec; @@ -12,10 +12,10 @@ unsigned short wBitsPerSample; unsigned short cbSize; } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; -#endif /* WAVEFORMATEX_ */ +#endif /* _WAVEFORMATEX_ */ -#ifndef MPEGLAYER3WAVEFORMAT_ -#define MPEGLAYER3WAVEFORMAT_ +#ifndef _MPEGLAYER3WAVEFORMAT_ +#define _MPEGLAYER3WAVEFORMAT_ typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { WAVEFORMATEX wf; unsigned short wID; @@ -24,11 +24,11 @@ unsigned short nFramesPerBlock; unsigned short nCodecDelay; } MPEGLAYER3WAVEFORMAT; -#endif /* MPEGLAYER3WAVEFORMAT_ */ +#endif /* _MPEGLAYER3WAVEFORMAT_ */ /* windows.h #includes wingdi.h on MinGW. */ -#if !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) -#define BITMAPINFOHEADER_ +#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H) +#define _BITMAPINFOHEADER_ typedef struct __attribute__((__packed__)) { int biSize; @@ -47,7 +47,7 @@ BITMAPINFOHEADER bmiHeader; int bmiColors[1]; } BITMAPINFO, *LPBITMAPINFO; -#endif /* !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) */ +#endif #ifndef le2me_BITMAPINFOHEADER #ifdef WORDS_BIGENDIAN