diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2003-05-15 14:07:28 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2003-05-15 14:07:28 +0000 |
| commit | 0f5ec75399ef32d05cd25e1ad7f18bb075a7687f (patch) | |
| tree | 8b1f1266fe3cde67ff5d23ded8cc743ae56bb090 | |
| parent | dc2815373debd4f2a3c541ac9b818dbdc90072c8 (diff) | |
| download | xine-lib-0f5ec75399ef32d05cd25e1ad7f18bb075a7687f.tar.gz xine-lib-0f5ec75399ef32d05cd25e1ad7f18bb075a7687f.tar.bz2 | |
Try to get it to compile.
CVS patchset: 4850
CVS date: 2003/05/15 14:07:28
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libw32dll/wine/driver.c | 3 | ||||
| -rw-r--r-- | src/libw32dll/wine/win32.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 41005bb40..2aab68888 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -10,12 +10,12 @@ noinst_LTLIBRARIES = $(wine_lib) # DEFAULT XINE FLAGS AND KNOW HOW TO FIX IT. CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ + -DWIN32_PATH="@w32_path@" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\\\"@w32_path@\\\" -I$(srcdir)/.. -D__WINE__ \ + -DWIN32_PATH="@w32_path@" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf if HAVE_W32DLL diff --git a/src/libw32dll/wine/driver.c b/src/libw32dll/wine/driver.c index 7720a4975..6ef5d7500 100644 --- a/src/libw32dll/wine/driver.c +++ b/src/libw32dll/wine/driver.c @@ -18,7 +18,6 @@ extern char* win32_def_path; - #if 1 /* @@ -58,7 +57,7 @@ void SetCodecPath(const char* path) if(needs_free)free(win32_def_path); if(path==0) { - win32_def_path=WIN32_PATH; + win32_def_path="WIN32_PATH"; needs_free=0; return; } diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c index 88766dcc8..66e1d11b8 100644 --- a/src/libw32dll/wine/win32.c +++ b/src/libw32dll/wine/win32.c @@ -78,7 +78,7 @@ static int vsscanf( const char *str, const char *format, va_list ap) } #endif -char* win32_def_path = WIN32_PATH; +char* win32_def_path = "WIN32_PATH"; static void do_cpuid(unsigned int ax, unsigned int *regs) { |