[Mplayer-cvslog] CVS: main/loader/wine mmreg.h,1.8,1.9

[Torinthiel CVS]

CVS change done by Torinthiel CVS

Update of /cvsroot/mplayer/main/loader/wine
In directory mail:/var2/tmp/cvs-serv14940/loader/wine

Modified Files:
	mmreg.h 
Log Message:
Better protection against double definition of MPEGLAYER3WAVEFORMAT


Index: mmreg.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/mmreg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mmreg.h	30 Apr 2004 10:26:26 -0000	1.8
+++ mmreg.h	9 Aug 2004 15:53:10 -0000	1.9
@@ -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 */