summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-01 10:48:29 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-01 10:48:29 +0000
commit80104b1757a0be278356041387b66039505b3a19 (patch)
treee2b37c5bafc5479493160774bcbf400fcaa80e46 /libmpdemux
parentc03c4b5431a8bb3cb19d00ac290567d1e7e02ad3 (diff)
downloadmpv-80104b1757a0be278356041387b66039505b3a19.tar.bz2
mpv-80104b1757a0be278356041387b66039505b3a19.tar.xz
Fix illegal identifiers starting with _ and capital letters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26138 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/ms_hdr.h20
1 files changed, 10 insertions, 10 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