[vlc-devel] commit: Fix merging the patch ( Felix Paul Kühne )
git version control
git at videolan.org
Thu Sep 11 14:26:33 CEST 2008
vlc | branch: 0.9-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Thu Sep 11 14:29:57 2008 +0200| [31aeec94e6cacc7776388091c2d13f881ae67b63] | committer: Felix Paul Kühne
Fix merging the patch
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=31aeec94e6cacc7776388091c2d13f881ae67b63
---
extras/contrib/src/Patches/libdvdread-win32.patch | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/extras/contrib/src/Patches/libdvdread-win32.patch b/extras/contrib/src/Patches/libdvdread-win32.patch
index c335ff9..eaf8541 100644
--- a/extras/contrib/src/Patches/libdvdread-win32.patch
+++ b/extras/contrib/src/Patches/libdvdread-win32.patch
@@ -1,7 +1,5 @@
-Index: src/dvd_reader.c
-===================================================================
---- src/dvd_reader.c (revision 1107)
-+++ src/dvd_reader.c (working copy)
+--- src/dvd_reader.c 2008-09-11 14:14:43.000000000 +0200
++++ src/dvd_reader.c 2008-09-11 14:18:53.000000000 +0200
@@ -32,6 +32,7 @@
#include <limits.h>
#include <dirent.h>
@@ -10,13 +8,11 @@ Index: src/dvd_reader.c
/* misc win32 helpers */
#ifdef WIN32
#ifndef HAVE_GETTIMEOFDAY
-@@ -50,7 +51,8 @@
+@@ -50,6 +51,7 @@
#include <io.h> /* read() */
#define lseek64 _lseeki64
#endif
--
+#endif
-+
+
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
#define SYS_BSD 1
- #endif
More information about the vlc-devel
mailing list