diff options
| -rw-r--r-- | libmpdemux/ms_hdr.h | 20 | ||||
| -rw-r--r-- | loader/wine/mmreg.h | 18 | ||||
| -rw-r--r-- | loader/wine/vfw.h | 4 |
3 files changed, 21 insertions, 21 deletions
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 6b810569d7..4c86cc12be 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -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 @@ typedef struct __attribute__((__packed__)) _WAVEFORMATEX { 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 @@ typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { 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 @@ typedef struct { BITMAPINFOHEADER bmiHeader; int bmiColors[1]; } BITMAPINFO, *LPBITMAPINFO; -#endif +#endif /* !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) */ #ifndef le2me_BITMAPINFOHEADER #ifdef WORDS_BIGENDIAN diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h index 5f6b460ef5..fe2341bb0a 100644 --- a/loader/wine/mmreg.h +++ b/loader/wine/mmreg.h @@ -48,8 +48,8 @@ typedef struct __attribute__((__packed__)) WAVEFILTER_ECHO { } 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 @@ typedef struct __attribute__((__packed__)) WAVEFORMATEX { WORD wBitsPerSample; WORD cbSize; } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; -#endif /* _WAVEFORMATEX_ */ +#endif /* WAVEFORMATEX_ */ #ifndef GUID_TYPE #define GUID_TYPE @@ -72,8 +72,8 @@ typedef struct } GUID; #endif -#ifndef _WAVEFORMATEXTENSIBLE_ -#define _WAVEFORMATEXTENSIBLE_ +#ifndef WAVEFORMATEXTENSIBLE_ +#define WAVEFORMATEXTENSIBLE_ typedef struct { WAVEFORMATEX Format; union { @@ -85,10 +85,10 @@ typedef struct { /* 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 @@ typedef struct mpeglayer3waveformat_tag { WORD nFramesPerBlock WINE_PACKED; WORD nCodecDelay WINE_PACKED; } MPEGLAYER3WAVEFORMAT; -#endif /* !_MPEGLAYER3WAVEFORMAT_ */ +#endif /* MPEGLAYER3WAVEFORMAT_ */ /* WAVE form wFormatTag IDs */ diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index e663129c82..bc918fef09 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -19,8 +19,8 @@ typedef struct __attribute__((__packed__)) long bfOffBits; } BITMAPFILEHEADER; -#ifndef _BITMAPINFOHEADER_ -#define _BITMAPINFOHEADER_ +#ifndef BITMAPINFOHEADER_ +#define BITMAPINFOHEADER_ typedef struct __attribute__((__packed__)) { long biSize; |