From 2e45172c98d04cf13e631726b360e5bcf5b296a4 Mon Sep 17 00:00:00 2001
From: wight <wight@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 9 Aug 2004 15:53:10 +0000
Subject: Better protection against double definition of MPEGLAYER3WAVEFORMAT

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12980 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/ms_hdr.h | 3 +++
 loader/wine/mmreg.h | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h
index 9af3e7d765..153f1ad361 100644
--- a/libmpdemux/ms_hdr.h
+++ b/libmpdemux/ms_hdr.h
@@ -14,6 +14,8 @@ typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
 #endif /* _WAVEFORMATEX_ */
 
+#ifndef _MPEGLAYER3WAVEFORMAT_
+#define _MPEGLAYER3WAVEFORMAT_
 typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
   WAVEFORMATEX wf;
   unsigned short wID;
@@ -22,6 +24,7 @@ typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
   unsigned short nFramesPerBlock;
   unsigned short nCodecDelay;
 } MPEGLAYER3WAVEFORMAT;
+#endif /* _MPEGLAYER3WAVEFORMAT_ */
 
 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
 #define _BITMAPINFOHEADER_
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 */
 
-- 
cgit v1.2.3