# HG changeset patch
# User wight
# Date 1092066790 0
# Node ID 6f18105c058a4df08906ac0c5ee8940f170e25fd
# Parent  fd3f2cacd434cbca5fd41135f1e8166d47a7eb8c
Better protection against double definition of MPEGLAYER3WAVEFORMAT

diff -r fd3f2cacd434 -r 6f18105c058a libmpdemux/ms_hdr.h
--- a/libmpdemux/ms_hdr.h	Mon Aug 09 11:12:52 2004 +0000
+++ b/libmpdemux/ms_hdr.h	Mon Aug 09 15:53:10 2004 +0000
@@ -14,6 +14,8 @@
 } 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 @@
   unsigned short nFramesPerBlock;
   unsigned short nCodecDelay;
 } MPEGLAYER3WAVEFORMAT;
+#endif /* _MPEGLAYER3WAVEFORMAT_ */
 
 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
 #define _BITMAPINFOHEADER_
diff -r fd3f2cacd434 -r 6f18105c058a loader/wine/mmreg.h
--- a/loader/wine/mmreg.h	Mon Aug 09 11:12:52 2004 +0000
+++ b/loader/wine/mmreg.h	Mon Aug 09 15:53:10 2004 +0000
@@ -83,7 +83,8 @@
 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
 #endif // !_WAVEFORMATEXTENSIBLE_
 
-/*
+#ifndef _MPEGLAYER3WAVEFORMAT_
+#define _MPEGLAYER3WAVEFORMAT_
 typedef struct mpeglayer3waveformat_tag {
   WORD   wFormatTag WINE_PACKED;
   WORD   nChannels WINE_PACKED;
@@ -98,7 +99,7 @@
   WORD          nFramesPerBlock WINE_PACKED;
   WORD          nCodecDelay WINE_PACKED;
 } MPEGLAYER3WAVEFORMAT;
-*/
+#endif /* !_MPEGLAYER3WAVEFORMAT_ */
 
 /* WAVE form wFormatTag IDs */