# HG changeset patch
# User rfelker
# Date 1083320786 0
# Node ID 6a61d694f7d3ba3050dab46fd9cbeb700de35a44
# Parent  ba3b91392d92bc1b56a5de779f1d18512015c7bb
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.

diff -r ba3b91392d92 -r 6a61d694f7d3 libmpcodecs/ad_qtaudio.c
--- a/libmpcodecs/ad_qtaudio.c	Fri Apr 30 10:07:52 2004 +0000
+++ b/libmpcodecs/ad_qtaudio.c	Fri Apr 30 10:26:26 2004 +0000
@@ -7,6 +7,7 @@
 #include "../mp_msg.h"
 
 #if defined(USE_QTX_CODECS) || defined(MACOSX)
+#include "wine/windef.h"
 
 #include "ad_internal.h"
 #include "bswap.h"
diff -r ba3b91392d92 -r 6a61d694f7d3 libmpcodecs/ad_realaud.c
--- a/libmpcodecs/ad_realaud.c	Fri Apr 30 10:07:52 2004 +0000
+++ b/libmpcodecs/ad_realaud.c	Fri Apr 30 10:26:26 2004 +0000
@@ -14,6 +14,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+#include "wine/windef.h"
 
 static ad_info_t info =  {
 	"RealAudio decoder",
diff -r ba3b91392d92 -r 6a61d694f7d3 libmpcodecs/vd_qtvideo.c
--- a/libmpcodecs/vd_qtvideo.c	Fri Apr 30 10:07:52 2004 +0000
+++ b/libmpcodecs/vd_qtvideo.c	Fri Apr 30 10:26:26 2004 +0000
@@ -4,6 +4,7 @@
 #include "config.h"
 
 #if defined(USE_QTX_CODECS) || defined(MACOSX)
+#include "wine/windef.h"
 
 #include "mp_msg.h"
 #include "vd_internal.h"
diff -r ba3b91392d92 -r 6a61d694f7d3 libmpcodecs/vd_realvid.c
--- a/libmpcodecs/vd_realvid.c	Fri Apr 30 10:07:52 2004 +0000
+++ b/libmpcodecs/vd_realvid.c	Fri Apr 30 10:26:26 2004 +0000
@@ -12,6 +12,7 @@
 #include "help_mp.h"
 
 #include "vd_internal.h"
+#include "wine/windef.h"
 
 static vd_info_t info = {
 	"RealVideo decoder",
diff -r ba3b91392d92 -r 6a61d694f7d3 libmpdemux/aviheader.h
--- a/libmpdemux/aviheader.h	Fri Apr 30 10:07:52 2004 +0000
+++ b/libmpdemux/aviheader.h	Fri Apr 30 10:26:26 2004 +0000
@@ -27,8 +27,8 @@
 #define aviTWOCC(ch0, ch1) ((uint16_t)(uint8_t)(ch0) | ((uint16_t)(uint8_t)(ch1) << 8))
 #endif
 
-typedef uint16_t TWOCC;
-typedef uint32_t FOURCC;
+//typedef uint16_t TWOCC;
+//typedef uint32_t FOURCC;
 
 /* form types, list types, and chunk types */
 #define formtypeAVI             mmioFOURCC('A', 'V', 'I', ' ')
@@ -96,8 +96,8 @@
 } rectangle_t;
 
 typedef struct {
-    FOURCC		fccType;
-    FOURCC		fccHandler;
+    uint32_t		fccType;
+    uint32_t		fccHandler;
     uint32_t		dwFlags;	/* Contains AVITF_* flags */
     uint16_t		wPriority;
     uint16_t		wLanguage;
diff -r ba3b91392d92 -r 6a61d694f7d3 loader/wine/mmreg.h
--- a/loader/wine/mmreg.h	Fri Apr 30 10:07:52 2004 +0000
+++ b/loader/wine/mmreg.h	Fri Apr 30 10:26:26 2004 +0000
@@ -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;
+*/
 
 /* WAVE form wFormatTag IDs */