[MPlayer-cvslog] r20746 - in trunk: Copyright libdvdcss/common.h libdvdcss/device.c

[diego]

Author: diego
Date: Tue Nov  7 17:42:39 2006
New Revision: 20746

Modified:
   trunk/Copyright
   trunk/libdvdcss/common.h
   trunk/libdvdcss/device.c

Log:
Fix linking on Cygwin and remove nonsense lseek64 --> lseek indirection,
all in one fell swoop.  Patch by yours truly accepted upstream.


Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright	(original)
+++ trunk/Copyright	Tue Nov  7 17:42:39 2006
@@ -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

Modified: trunk/libdvdcss/common.h
==============================================================================
--- trunk/libdvdcss/common.h	(original)
+++ trunk/libdvdcss/common.h	Tue Nov  7 17:42:39 2006
@@ -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
 

Modified: trunk/libdvdcss/device.c
==============================================================================
--- trunk/libdvdcss/device.c	(original)
+++ trunk/libdvdcss/device.c	Tue Nov  7 17:42:39 2006
@@ -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 )
     {