mirror of https://github.com/mpv-player/mpv
Fix illegal identifiers starting with _ and capital letters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26138 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c03c4b5431
commit
80104b1757
|
@ -1,9 +1,9 @@
|
||||||
#ifndef MPLAYER_MS_HDR_H
|
#ifndef MPLAYER_MS_HDR_H
|
||||||
#define MPLAYER_MS_HDR_H
|
#define MPLAYER_MS_HDR_H
|
||||||
|
|
||||||
#ifndef _WAVEFORMATEX_
|
#ifndef WAVEFORMATEX_
|
||||||
#define _WAVEFORMATEX_
|
#define WAVEFORMATEX_
|
||||||
typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
|
typedef struct __attribute__((__packed__)) WAVEFORMATEX {
|
||||||
unsigned short wFormatTag;
|
unsigned short wFormatTag;
|
||||||
unsigned short nChannels;
|
unsigned short nChannels;
|
||||||
unsigned int nSamplesPerSec;
|
unsigned int nSamplesPerSec;
|
||||||
|
@ -12,10 +12,10 @@ typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
|
||||||
unsigned short wBitsPerSample;
|
unsigned short wBitsPerSample;
|
||||||
unsigned short cbSize;
|
unsigned short cbSize;
|
||||||
} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
|
} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
|
||||||
#endif /* _WAVEFORMATEX_ */
|
#endif /* WAVEFORMATEX_ */
|
||||||
|
|
||||||
#ifndef _MPEGLAYER3WAVEFORMAT_
|
#ifndef MPEGLAYER3WAVEFORMAT_
|
||||||
#define _MPEGLAYER3WAVEFORMAT_
|
#define MPEGLAYER3WAVEFORMAT_
|
||||||
typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
|
typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
|
||||||
WAVEFORMATEX wf;
|
WAVEFORMATEX wf;
|
||||||
unsigned short wID;
|
unsigned short wID;
|
||||||
|
@ -24,11 +24,11 @@ typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
|
||||||
unsigned short nFramesPerBlock;
|
unsigned short nFramesPerBlock;
|
||||||
unsigned short nCodecDelay;
|
unsigned short nCodecDelay;
|
||||||
} MPEGLAYER3WAVEFORMAT;
|
} MPEGLAYER3WAVEFORMAT;
|
||||||
#endif /* _MPEGLAYER3WAVEFORMAT_ */
|
#endif /* MPEGLAYER3WAVEFORMAT_ */
|
||||||
|
|
||||||
/* windows.h #includes wingdi.h on MinGW. */
|
/* windows.h #includes wingdi.h on MinGW. */
|
||||||
#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
|
#if !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H)
|
||||||
#define _BITMAPINFOHEADER_
|
#define BITMAPINFOHEADER_
|
||||||
typedef struct __attribute__((__packed__))
|
typedef struct __attribute__((__packed__))
|
||||||
{
|
{
|
||||||
int biSize;
|
int biSize;
|
||||||
|
@ -47,7 +47,7 @@ typedef struct {
|
||||||
BITMAPINFOHEADER bmiHeader;
|
BITMAPINFOHEADER bmiHeader;
|
||||||
int bmiColors[1];
|
int bmiColors[1];
|
||||||
} BITMAPINFO, *LPBITMAPINFO;
|
} BITMAPINFO, *LPBITMAPINFO;
|
||||||
#endif
|
#endif /* !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) */
|
||||||
|
|
||||||
#ifndef le2me_BITMAPINFOHEADER
|
#ifndef le2me_BITMAPINFOHEADER
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
|
|
|
@ -48,8 +48,8 @@ typedef struct __attribute__((__packed__)) WAVEFILTER_ECHO {
|
||||||
} ECHOWAVEFILTER, *PECHOWAVEFILTER, *NPECHOWAVEFILTER, *LPECHOWAVEFILTER;
|
} ECHOWAVEFILTER, *PECHOWAVEFILTER, *NPECHOWAVEFILTER, *LPECHOWAVEFILTER;
|
||||||
#endif /* WAVEFILTER_ECHO */
|
#endif /* WAVEFILTER_ECHO */
|
||||||
|
|
||||||
#ifndef _WAVEFORMATEX_
|
#ifndef WAVEFORMATEX_
|
||||||
#define _WAVEFORMATEX_
|
#define WAVEFORMATEX_
|
||||||
typedef struct __attribute__((__packed__)) WAVEFORMATEX {
|
typedef struct __attribute__((__packed__)) WAVEFORMATEX {
|
||||||
WORD wFormatTag;
|
WORD wFormatTag;
|
||||||
WORD nChannels;
|
WORD nChannels;
|
||||||
|
@ -59,7 +59,7 @@ typedef struct __attribute__((__packed__)) WAVEFORMATEX {
|
||||||
WORD wBitsPerSample;
|
WORD wBitsPerSample;
|
||||||
WORD cbSize;
|
WORD cbSize;
|
||||||
} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
|
} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
|
||||||
#endif /* _WAVEFORMATEX_ */
|
#endif /* WAVEFORMATEX_ */
|
||||||
|
|
||||||
#ifndef GUID_TYPE
|
#ifndef GUID_TYPE
|
||||||
#define GUID_TYPE
|
#define GUID_TYPE
|
||||||
|
@ -72,8 +72,8 @@ typedef struct
|
||||||
} GUID;
|
} GUID;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _WAVEFORMATEXTENSIBLE_
|
#ifndef WAVEFORMATEXTENSIBLE_
|
||||||
#define _WAVEFORMATEXTENSIBLE_
|
#define WAVEFORMATEXTENSIBLE_
|
||||||
typedef struct {
|
typedef struct {
|
||||||
WAVEFORMATEX Format;
|
WAVEFORMATEX Format;
|
||||||
union {
|
union {
|
||||||
|
@ -85,10 +85,10 @@ typedef struct {
|
||||||
/* present in stream */
|
/* present in stream */
|
||||||
GUID SubFormat;
|
GUID SubFormat;
|
||||||
} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
|
} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
|
||||||
#endif // !_WAVEFORMATEXTENSIBLE_
|
#endif /* WAVEFORMATEXTENSIBLE_ */
|
||||||
|
|
||||||
#ifndef _MPEGLAYER3WAVEFORMAT_
|
#ifndef MPEGLAYER3WAVEFORMAT_
|
||||||
#define _MPEGLAYER3WAVEFORMAT_
|
#define MPEGLAYER3WAVEFORMAT_
|
||||||
typedef struct mpeglayer3waveformat_tag {
|
typedef struct mpeglayer3waveformat_tag {
|
||||||
WORD wFormatTag WINE_PACKED;
|
WORD wFormatTag WINE_PACKED;
|
||||||
WORD nChannels WINE_PACKED;
|
WORD nChannels WINE_PACKED;
|
||||||
|
@ -103,7 +103,7 @@ typedef struct mpeglayer3waveformat_tag {
|
||||||
WORD nFramesPerBlock WINE_PACKED;
|
WORD nFramesPerBlock WINE_PACKED;
|
||||||
WORD nCodecDelay WINE_PACKED;
|
WORD nCodecDelay WINE_PACKED;
|
||||||
} MPEGLAYER3WAVEFORMAT;
|
} MPEGLAYER3WAVEFORMAT;
|
||||||
#endif /* !_MPEGLAYER3WAVEFORMAT_ */
|
#endif /* MPEGLAYER3WAVEFORMAT_ */
|
||||||
|
|
||||||
/* WAVE form wFormatTag IDs */
|
/* WAVE form wFormatTag IDs */
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,8 @@ typedef struct __attribute__((__packed__))
|
||||||
long bfOffBits;
|
long bfOffBits;
|
||||||
} BITMAPFILEHEADER;
|
} BITMAPFILEHEADER;
|
||||||
|
|
||||||
#ifndef _BITMAPINFOHEADER_
|
#ifndef BITMAPINFOHEADER_
|
||||||
#define _BITMAPINFOHEADER_
|
#define BITMAPINFOHEADER_
|
||||||
typedef struct __attribute__((__packed__))
|
typedef struct __attribute__((__packed__))
|
||||||
{
|
{
|
||||||
long biSize;
|
long biSize;
|
||||||
|
|
Loading…
Reference in New Issue