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

[Torinthiel]

On Fri, Apr 30, 2004 at 12:26:28PM +0200, Richard Felker CVS wrote:
> CVS change done by Richard Felker CVS
> 
> Update of /cvsroot/mplayer/main/loader/wine
> In directory mail:/var2/tmp/cvs-serv30320/loader/wine
> 
> Modified Files:
> 	mmreg.h 
> Log Message:
> minimal fix for alex's 1000000000000l compile errors. imo the fix in
> aviheader.h is totally correct. defining useless typedefs that can
> conflict with other headers is bad practice. i don't like editing
> mmreg.h but oh well... if you have a better fix, commit it! finally,
> the fix in the ad_ and vd_ files seems totally correct.
> 
> 
> Index: mmreg.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/loader/wine/mmreg.h,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- mmreg.h	13 Sep 2002 19:43:17 -0000	1.7
> +++ mmreg.h	30 Apr 2004 10:26:26 -0000	1.8
> @@ -83,6 +83,7 @@
>  } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
>  #endif // !_WAVEFORMATEXTENSIBLE_
>  
> +/*
>  typedef struct mpeglayer3waveformat_tag {
>    WORD   wFormatTag WINE_PACKED;
>    WORD   nChannels WINE_PACKED;
> @@ -97,6 +98,7 @@
>    WORD          nFramesPerBlock WINE_PACKED;
>    WORD          nCodecDelay WINE_PACKED;
>  } MPEGLAYER3WAVEFORMAT;
> +*/

I would rather suggest something like this - it works if someone doesn't
include ms_hdr.h.
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)wp(dot)pl
   gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8  7346 2B6E 39F2 B069 01F1
 "No classmates may be used during this examination"
-------------- next part --------------
Index: libmpdemux/ms_hdr.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ms_hdr.h,v
retrieving revision 1.1
diff -u -r1.1 ms_hdr.h
--- libmpdemux/ms_hdr.h	28 Apr 2004 10:18:33 -0000	1.1
+++ libmpdemux/ms_hdr.h	1 May 2004 16:34:59 -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_
Index: loader/wine/mmreg.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/mmreg.h,v
retrieving revision 1.8
diff -u -r1.8 mmreg.h
--- loader/wine/mmreg.h	30 Apr 2004 10:26:26 -0000	1.8
+++ loader/wine/mmreg.h	1 May 2004 16:34:59 -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
 
 /* WAVE form wFormatTag IDs */
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/attachments/20040501/2019d780/attachment.pgp>