[MPlayer-cvslog] CVS: main/libmpdvdkit2 common.h, 1.8, 1.9 libdvdread_changes.diff, 1.5, 1.6

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdvdkit2
In directory mail:/var2/tmp/cvs-serv15830

Modified Files:
	common.h libdvdread_changes.diff 
Log Message:
Compile fix: _lseeki64 is not available under cygwin


Index: common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- common.h	9 Oct 2005 10:18:24 -0000	1.8
+++ common.h	11 Oct 2005 12:17:09 -0000	1.9
@@ -3,6 +3,9 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
+ *
+ * Modified for use with MPlayer, changes contained in libdvdread_changes.diff.
+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
  * $Id$
  *
  * Authors: Samuel Hocevar <sam at via.ecp.fr>
@@ -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;

Index: libdvdread_changes.diff
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdread_changes.diff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libdvdread_changes.diff	4 Oct 2005 16:47:38 -0000	1.5
+++ libdvdread_changes.diff	11 Oct 2005 12:17:09 -0000	1.6
@@ -70,6 +70,21 @@
   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