[MPlayer-dev-eng] [PATCH] fix CVS compile issue - first try

[joy at pingfm.org]

On Wed, 28 Apr 2004, adland wrote:

> I have made a patch which will allow CVS to at least
> compile again
> 
> It may need testing and some cleanup but I am
> submitting it for at least consideration.
another diff against current cvs. some wine-stuff included and some 
defines and structs commented out.
i don't need these changes in libmpcodecs. 
why do you needed adland?


regards

joy

________________________________________
do interactive tv on www.remote-tv.de
-------------- next part --------------
diff -Nur -x CVS -x DOC -x '.*' -x '*~' -x 'config.*' clean-cvs/libmpdemux/aviheader.c mplayer-mod/libmpdemux/aviheader.c
--- clean-cvs/libmpdemux/aviheader.c	2004-04-28 01:08:46.000000000 +0200
+++ mplayer-mod/libmpdemux/aviheader.c	2004-04-28 18:19:54.000000000 +0200
@@ -4,6 +4,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include "wine/windef.h"
+
 #include "config.h"
 #include "mp_msg.h"
 
diff -Nur -x CVS -x DOC -x '.*' -x '*~' -x 'config.*' clean-cvs/libmpdemux/aviheader.h mplayer-mod/libmpdemux/aviheader.h
--- clean-cvs/libmpdemux/aviheader.h	2004-04-28 12:18:33.000000000 +0200
+++ mplayer-mod/libmpdemux/aviheader.h	2004-04-28 18:34:49.000000000 +0200
@@ -3,6 +3,8 @@
 
 //#include "config.h"	/* get correct definition WORDS_BIGENDIAN */
 #include "bswap.h"
+#include "wine/windef.h"
+#include "wine/msacm.h"
 
 #ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))
@@ -28,7 +30,7 @@
 #endif
 
 typedef uint16_t TWOCC;
-typedef uint32_t FOURCC;
+//typedef uint32_t FOURCC;
 
 /* form types, list types, and chunk types */
 #define formtypeAVI             mmioFOURCC('A', 'V', 'I', ' ')
@@ -88,16 +90,6 @@
     uint32_t		dwReserved[4];
 } MainAVIHeader;
 
-/* The RECT structure */
-typedef struct tagRECT
-{
-    short  left;
-    short  top;
-    short  right;
-    short  bottom;
-} RECT, *PRECT, *LPRECT;
-typedef const RECT *LPCRECT;
-
 typedef struct {
     FOURCC		fccType;
     FOURCC		fccHandler;
diff -Nur -x CVS -x DOC -x '.*' -x '*~' -x 'config.*' clean-cvs/libmpdemux/ms_hdr.h mplayer-mod/libmpdemux/ms_hdr.h
--- clean-cvs/libmpdemux/ms_hdr.h	2004-04-28 12:18:33.000000000 +0200
+++ mplayer-mod/libmpdemux/ms_hdr.h	2004-04-28 18:36:38.000000000 +0200
@@ -1,6 +1,8 @@
 #ifndef __MS_HEADER_H
 #define __MS_HEADER_H 1
 
+#include "wine/mmreg.h"
+
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
 typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
@@ -14,14 +16,14 @@
 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
 #endif /* _WAVEFORMATEX_ */
 
-typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
-  WAVEFORMATEX wf;
-  unsigned short wID;
-  unsigned int   fdwFlags;
-  unsigned short nBlockSize;
-  unsigned short nFramesPerBlock;
-  unsigned short nCodecDelay;
-} MPEGLAYER3WAVEFORMAT;
+/* typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { */
+/*   WAVEFORMATEX wf; */
+/*   unsigned short wID; */
+/*   unsigned int   fdwFlags; */
+/*   unsigned short nBlockSize; */
+/*   unsigned short nFramesPerBlock; */
+/*   unsigned short nCodecDelay; */
+/* } MPEGLAYER3WAVEFORMAT; */