Skip to content

V
vlc
Commit 31aeec94 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

Fix merging the patch

parent 4978b77e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
extras/contrib/src/Patches/libdvdread-win32.patch
View file @ 31aeec94
Index: src/dvd_reader.c --- src/dvd_reader.c 2008-09-11 14:14:43.000000000 +0200
=================================================================== +++ src/dvd_reader.c 2008-09-11 14:18:53.000000000 +0200
--- src/dvd_reader.c (revision 1107)
+++ src/dvd_reader.c (working copy)
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
#include <limits.h> #include <limits.h>
#include <dirent.h> #include <dirent.h>
...@@ -10,13 +8,11 @@ Index: src/dvd_reader.c ...@@ -10,13 +8,11 @@ Index: src/dvd_reader.c
/* misc win32 helpers */ /* misc win32 helpers */
#ifdef WIN32 #ifdef WIN32
#ifndef HAVE_GETTIMEOFDAY #ifndef HAVE_GETTIMEOFDAY
@@ -50,7 +51,8 @@ @@ -50,6 +51,7 @@
#include <io.h> /* read() */ #include <io.h> /* read() */
#define lseek64 _lseeki64 #define lseek64 _lseeki64
#endif #endif
-
+#endif +#endif
+
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
#define SYS_BSD 1 #define SYS_BSD 1
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment