CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libmpdvdkit2 In directory mail:/var2/tmp/cvs-serv30211 Modified Files: libdvdcss_changes.diff libdvdread_changes.diff Log Message: 10l to Reimar: common.h belongs to libdvdcss, not libdvdread. Index: libdvdcss_changes.diff =================================================================== RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdcss_changes.diff,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libdvdcss_changes.diff 9 Oct 2005 10:18:24 -0000 1.5 +++ libdvdcss_changes.diff 24 Oct 2005 09:29:15 -0000 1.6 @@ -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 @@ Index: libdvdread_changes.diff =================================================================== RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdread_changes.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libdvdread_changes.diff 11 Oct 2005 12:17:09 -0000 1.6 +++ libdvdread_changes.diff 24 Oct 2005 09:29:15 -0000 1.7 @@ -70,21 +70,6 @@ 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