From ab7525dbd45742cd9b583c1fb1cc4ff2443414e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sat, 5 Jan 2008 01:35:38 +0100
Subject: Add a mangle.h file with the definition of MANGLE from FFmpeg's
 libavutil, and use it.

---
 src/libw32dll/wine/Makefile.am | 3 ++-
 src/libw32dll/wine/win32.c     | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/libw32dll')

diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index 1756e3262..170f31086 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -5,7 +5,8 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \
         -fno-omit-frame-pointer -fno-inline-functions -fno-rename-registers
 AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -I$(srcdir)/.. -D__WINE__ \
-	-Ddbg_printf=__vprintf -DTRACE=__vprintf
+	-Ddbg_printf=__vprintf -DTRACE=__vprintf \
+        -I$(top_srcdir)/src/xine-utils
 
 EXTRA_DIST = stubs.s wrapper.S
 
diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c
index 01a287c31..14ee178de 100644
--- a/src/libw32dll/wine/win32.c
+++ b/src/libw32dll/wine/win32.c
@@ -5058,11 +5058,9 @@ struct libs libraries[]={
     LL(ddraw)
 #endif
 };
-#if defined(__CYGWIN__) || defined(__OS2__) || defined (__OpenBSD__)
-#define MANGLE(a) "_" #a
-#else
-#define MANGLE(a) #a
-#endif
+
+#include "mangle.h"
+
 static void ext_stubs(void)
 {
     // expects:
-- 
cgit v1.2.3