From 243d2ec51edb3bd9e5f0d2308e91f5e3a71a1bd1 Mon Sep 17 00:00:00 2001
From: Juergen Keil <jkeil@users.sourceforge.net>
Date: Sun, 9 Sep 2001 15:56:55 +0000
Subject: Add a hack to "wine" (WINE_TYPEDEFS_ONLY), to allow compiling the avi
 demuxer plugin using a non-gcc compiler.  The avi demuxer does not use
 functions from "wine" - only defines / structures / typedefs.

CVS patchset: 594
CVS date: 2001/09/09 15:56:55
---
 src/demuxers/demux_avi.c    | 6 ++++--
 src/libw32dll/wine/windef.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 8d533cc9c..9ac122007 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_avi.c,v 1.38 2001/09/08 18:11:41 guenter Exp $
+ * $Id: demux_avi.c,v 1.39 2001/09/09 15:56:55 jkeil Exp $
  *
  * demultiplexer for avi streams
  *
@@ -41,8 +41,10 @@
 #include "monitor.h"
 #include "demux.h"
 #include "utils.h"
-#include "libw32dll/wine/mmreg.h"
+
+#define	WINE_TYPEDEFS_ONLY
 #include "libw32dll/wine/avifmt.h"
+#include "libw32dll/wine/windef.h"
 #include "libw32dll/wine/vfw.h"
 
 /* The following variable indicates the kind of error */
diff --git a/src/libw32dll/wine/windef.h b/src/libw32dll/wine/windef.h
index d6dfcfae2..01e5175b3 100644
--- a/src/libw32dll/wine/windef.h
+++ b/src/libw32dll/wine/windef.h
@@ -105,7 +105,7 @@ extern "C" {
 
 /* Calling conventions definitions */
 
-#ifdef __i386__
+#if defined(__i386__) && !defined(WINE_TYPEDEFS_ONLY)
 # if defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
 #  ifndef _EGCS_ 
 #define __stdcall __attribute__((__stdcall__))
-- 
cgit v1.2.3