diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 16:00:23 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 16:00:23 +0000 |
| commit | b25c91e086a5bef47dfae5838b1e149084dfca47 (patch) | |
| tree | ad6d55e3fedac978a0de17d2ea5432184dc233d2 /src/libw32dll | |
| parent | a574ab02526c78074f643971beebf2b86a3d16e6 (diff) | |
| parent | c414377fbfa2be0577381c80dd0171061e242905 (diff) | |
| download | xine-lib-b25c91e086a5bef47dfae5838b1e149084dfca47.tar.gz xine-lib-b25c91e086a5bef47dfae5838b1e149084dfca47.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libw32dll/wine/win32.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 1756e3262..7036716b1 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: |