From e19c97bfd474257e18b8085b2e857b3ecf5f6763 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 7 Nov 2006 16:42:39 +0000 Subject: Fix linking on Cygwin and remove nonsense lseek64 --> lseek indirection, all in one fell swoop. Patch by yours truly accepted upstream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20746 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Copyright | 2 +- libdvdcss/common.h | 7 ++----- libdvdcss/device.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Copyright b/Copyright index d396b9a396..745e12a510 100644 --- a/Copyright +++ b/Copyright @@ -49,7 +49,7 @@ Copyright: 1999-2000 Aaron Holtzman 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 diff --git a/libdvdcss/common.h b/libdvdcss/common.h index 9a7ca3b510..8e97fc3ab1 100644 --- a/libdvdcss/common.h +++ b/libdvdcss/common.h @@ -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 @@ typedef _off_t off_t; # 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 @@ typedef __int64 off_t; # define snprintf _snprintf /* snprintf not defined in mingw32 (bug?) */ # endif -#else - -# define lseek64 lseek - #endif diff --git a/libdvdcss/device.c b/libdvdcss/device.c index 580ce3c0fe..8185f17d21 100644 --- a/libdvdcss/device.c +++ b/libdvdcss/device.c @@ -592,7 +592,7 @@ static int libc_seek( dvdcss_t dvdcss, int i_blocks ) } 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 ) { -- cgit v1.2.3