diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-07 16:42:39 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-07 16:42:39 +0000 |
| commit | e19c97bfd474257e18b8085b2e857b3ecf5f6763 (patch) | |
| tree | 59d9567f799596521f617deaa587c1c86bb503c0 /libdvdcss | |
| parent | 863ec4e1a2c44a1fb9aae7fb02ed98df76f55ff5 (diff) | |
| download | mpv-e19c97bfd474257e18b8085b2e857b3ecf5f6763.tar.bz2 mpv-e19c97bfd474257e18b8085b2e857b3ecf5f6763.tar.xz | |
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
Diffstat (limited to 'libdvdcss')
| -rw-r--r-- | libdvdcss/common.h | 7 | ||||
| -rw-r--r-- | libdvdcss/device.c | 2 |
2 files changed, 3 insertions, 6 deletions
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 ) { |