summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorwight <wight@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-09 15:53:10 +0000
committerwight <wight@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-09 15:53:10 +0000
commit2e45172c98d04cf13e631726b360e5bcf5b296a4 (patch)
treee19ca10a0eb0b935d3d27b8bd875ffd3eec9caff /loader
parent57017402ede8d7f6c53bc33bff71b2edba9ab1de (diff)
downloadmpv-2e45172c98d04cf13e631726b360e5bcf5b296a4.tar.bz2
mpv-2e45172c98d04cf13e631726b360e5bcf5b296a4.tar.xz
Better protection against double definition of MPEGLAYER3WAVEFORMAT
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12980 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r--loader/wine/mmreg.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h
index b75e34882f..e0facc8944 100644
--- a/loader/wine/mmreg.h
+++ b/loader/wine/mmreg.h
@@ -83,7 +83,8 @@ typedef struct {
} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
#endif // !_WAVEFORMATEXTENSIBLE_
-/*
+#ifndef _MPEGLAYER3WAVEFORMAT_
+#define _MPEGLAYER3WAVEFORMAT_
typedef struct mpeglayer3waveformat_tag {
WORD wFormatTag WINE_PACKED;
WORD nChannels WINE_PACKED;
@@ -98,7 +99,7 @@ typedef struct mpeglayer3waveformat_tag {
WORD nFramesPerBlock WINE_PACKED;
WORD nCodecDelay WINE_PACKED;
} MPEGLAYER3WAVEFORMAT;
-*/
+#endif /* !_MPEGLAYER3WAVEFORMAT_ */
/* WAVE form wFormatTag IDs */