diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-24 09:29:15 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-24 09:29:15 +0000 |
commit | 072bf7aa06f09778fd613ae652027aaa9ad3fe8a (patch) | |
tree | 55e9bfb4834f45d9334d12f1b755d05d8677d371 | |
parent | ff48164f90ee4300ee22287262c82b69cfb91a83 (diff) | |
download | mpv-072bf7aa06f09778fd613ae652027aaa9ad3fe8a.tar.bz2 mpv-072bf7aa06f09778fd613ae652027aaa9ad3fe8a.tar.xz |
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16848 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdvdkit2/libdvdcss_changes.diff | 14 | ||||
-rw-r--r-- | libmpdvdkit2/libdvdread_changes.diff | 15 |
2 files changed, 14 insertions, 15 deletions
diff --git a/libmpdvdkit2/libdvdcss_changes.diff b/libmpdvdkit2/libdvdcss_changes.diff index 4789a873eb..b6b25810e2 100644 --- a/libmpdvdkit2/libdvdcss_changes.diff +++ b/libmpdvdkit2/libdvdcss_changes.diff @@ -1,3 +1,17 @@ +--- common.h 2005-10-11 10:55:45.000000000 +0200 ++++ common.h 2005-10-11 14:07:42.000000000 +0200 +@@ -50,10 +53,9 @@ + # define PATH_MAX MAX_PATH + #endif + +-#define lseek _lseeki64 +- + /* several type definitions */ + # if defined( __MINGW32__ ) ++#define lseek _lseeki64 + # if !defined( _OFF_T_ ) + typedef long long _off_t; + typedef _off_t off_t; --- css.c 2005-07-11 14:24:09.000000000 +0200 +++ css.c 2005-10-01 20:14:37.000000000 +0200 @@ -53,7 +56,7 @@ diff --git a/libmpdvdkit2/libdvdread_changes.diff b/libmpdvdkit2/libdvdread_changes.diff index 20d297cb94..1cfc8c0277 100644 --- a/libmpdvdkit2/libdvdread_changes.diff +++ b/libmpdvdkit2/libdvdread_changes.diff @@ -70,21 +70,6 @@ diff -Naur dvdread.orig/bswap.h dvdread/bswap.h x = ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore -diff -Naur dvdread.orig/common.h dvdread/common.h ---- dvdread.orig/common.h 2005-10-11 10:55:45.000000000 +0200 -+++ dvdread/common.h 2005-10-11 14:07:42.000000000 +0200 -@@ -50,10 +50,9 @@ - # define PATH_MAX MAX_PATH - #endif - --#define lseek _lseeki64 -- - /* several type definitions */ - # if defined( __MINGW32__ ) -+#define lseek _lseeki64 - # if !defined( _OFF_T_ ) - typedef long long _off_t; - typedef _off_t off_t; diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c --- dvdread.orig/dvd_input.c 2005-06-23 00:18:54.000000000 +0200 +++ dvdread/dvd_input.c 2005-06-23 00:30:23.000000000 +0200 |