Mercurial > mplayer.hg
diff loader/wine/mmreg.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 | 0f1b5b68af32 |
line wrap: on
line diff
--- a/loader/wine/mmreg.h Sat Mar 01 20:09:22 2008 +0000 +++ b/loader/wine/mmreg.h Sun Mar 02 19:38:50 2008 +0000 @@ -48,8 +48,8 @@ } ECHOWAVEFILTER, *PECHOWAVEFILTER, *NPECHOWAVEFILTER, *LPECHOWAVEFILTER; #endif /* WAVEFILTER_ECHO */ -#ifndef WAVEFORMATEX_ -#define WAVEFORMATEX_ +#ifndef _WAVEFORMATEX_ +#define _WAVEFORMATEX_ typedef struct __attribute__((__packed__)) WAVEFORMATEX { WORD wFormatTag; WORD nChannels; @@ -59,7 +59,7 @@ WORD wBitsPerSample; WORD cbSize; } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; -#endif /* WAVEFORMATEX_ */ +#endif /* _WAVEFORMATEX_ */ #ifndef GUID_TYPE #define GUID_TYPE @@ -72,8 +72,8 @@ } GUID; #endif -#ifndef WAVEFORMATEXTENSIBLE_ -#define WAVEFORMATEXTENSIBLE_ +#ifndef _WAVEFORMATEXTENSIBLE_ +#define _WAVEFORMATEXTENSIBLE_ typedef struct { WAVEFORMATEX Format; union { @@ -85,10 +85,10 @@ /* present in stream */ GUID SubFormat; } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; -#endif /* WAVEFORMATEXTENSIBLE_ */ +#endif // !_WAVEFORMATEXTENSIBLE_ -#ifndef MPEGLAYER3WAVEFORMAT_ -#define MPEGLAYER3WAVEFORMAT_ +#ifndef _MPEGLAYER3WAVEFORMAT_ +#define _MPEGLAYER3WAVEFORMAT_ typedef struct mpeglayer3waveformat_tag { WORD wFormatTag WINE_PACKED; WORD nChannels WINE_PACKED; @@ -103,7 +103,7 @@ WORD nFramesPerBlock WINE_PACKED; WORD nCodecDelay WINE_PACKED; } MPEGLAYER3WAVEFORMAT; -#endif /* MPEGLAYER3WAVEFORMAT_ */ +#endif /* !_MPEGLAYER3WAVEFORMAT_ */ /* WAVE form wFormatTag IDs */