summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav/diff_against_cvs.patch
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-04-23 16:24:18 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-04-23 16:24:18 +0000
commit483bf72bb184a76990634051b6cb673c10eadcbf (patch)
tree5f983476aa8f5ed6dd173a385c87b209d14beb1c /src/input/libdvdnav/diff_against_cvs.patch
parenta68f00985f1ae81290abcdcd41bbdb5c58968bb6 (diff)
downloadxine-lib-483bf72bb184a76990634051b6cb673c10eadcbf.tar.gz
xine-lib-483bf72bb184a76990634051b6cb673c10eadcbf.tar.bz2
preserve win32 patches for later merges of new versions
CVS patchset: 4665 CVS date: 2003/04/23 16:24:18
Diffstat (limited to 'src/input/libdvdnav/diff_against_cvs.patch')
-rw-r--r--src/input/libdvdnav/diff_against_cvs.patch14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index a68b867e4..21fe87e6e 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -42,8 +42,20 @@
this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
--- src/input/libdvdnav/dvdnav.h Thu Jul 25 17:26:00 2002
+++ src/input/libdvdnav/dvdnav.h Fri Aug 9 22:01:19 2002
-@@ -41,8 +41,8 @@
+@@ -34,8 +34,13 @@
+ #endif
+
+ #ifdef HAVE_DVDNAV
++#ifndef _MSC_VER
+ # include <dvdnav/dvdnav_events.h>
# include <dvdnav/dvd_types.h>
++#else
++# include "dvdnav_events.h"
++# include "dvd_types.h"
++#endif /* _MSC_VER */
+ #else
+ # include "dvdnav_events.h"
+ # include "dvd_types.h"
#endif
-#include <dvdread/dvd_reader.h>