diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-02 19:38:50 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-02 19:38:50 +0000 |
| commit | a27f73390fd3305a8279fc2c183c2b0c42730b61 (patch) | |
| tree | fc06757b063b732ce924f7082c19ad366f396a2a /libmpdemux | |
| parent | ae181c92fe3b301d1906fc03016e1001aa92f253 (diff) | |
| download | mpv-a27f73390fd3305a8279fc2c183c2b0c42730b61.tar.bz2 mpv-a27f73390fd3305a8279fc2c183c2b0c42730b61.tar.xz | |
Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately
these identifiers appear in Windows system headers and are thus outside our
direct control.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26141 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/ms_hdr.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 4c86cc12be..6b810569d7 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 /* !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) */ +#endif #ifndef le2me_BITMAPINFOHEADER #ifdef WORDS_BIGENDIAN |