Mercurial > mplayer.hg
changeset 20730:66c2f233ccff
Fix linking on Cygwin and remove nonsense lseek64 --> lseek indirection,
all in one fell swoop. Patch by yours truly accepted upstream.
| author | diego |
|---|---|
| date | Tue, 07 Nov 2006 16:42:39 +0000 |
| parents | 6cf79142b5a7 |
| children | 8ac598494946 |
| files | Copyright libdvdcss/common.h libdvdcss/device.c |
| diffstat | 3 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Copyright Tue Nov 07 16:40:22 2006 +0000 +++ b/Copyright Tue Nov 07 16:42:39 2006 +0000 @@ -49,7 +49,7 @@ License: GNU General Public License Name: libdvdcss -Version: Subversion r202 (post 1.2.9 release) +Version: Subversion r203 (post 1.2.9 release) Homepage: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss Copyright: 1998-2006 VideoLAN
--- a/libdvdcss/common.h Tue Nov 07 16:40:22 2006 +0000 +++ b/libdvdcss/common.h Tue Nov 07 16:42:39 2006 +0000 @@ -52,7 +52,7 @@ /* several type definitions */ # if defined( __MINGW32__ ) -# define lseek64 _lseeki64 +# define lseek _lseeki64 # if !defined( _OFF_T_ ) typedef long long _off_t; typedef _off_t off_t; @@ -63,6 +63,7 @@ # endif # if defined( _MSC_VER ) +# define lseek _lseeki64 # if !defined( _OFF_T_DEFINED ) typedef __int64 off_t; # define _OFF_T_DEFINED @@ -76,9 +77,5 @@ # define snprintf _snprintf /* snprintf not defined in mingw32 (bug?) */ # endif -#else - -# define lseek64 lseek - #endif
--- a/libdvdcss/device.c Tue Nov 07 16:40:22 2006 +0000 +++ b/libdvdcss/device.c Tue Nov 07 16:42:39 2006 +0000 @@ -592,7 +592,7 @@ } i_seek = (off_t)i_blocks * (off_t)DVDCSS_BLOCK_SIZE; - i_seek = lseek64( dvdcss->i_read_fd, i_seek, SEEK_SET ); + i_seek = lseek( dvdcss->i_read_fd, i_seek, SEEK_SET ); if( i_seek < 0 ) {