Mercurial > mplayer.hg
changeset 16726:880739620241
Compile fix: _lseeki64 is not available under cygwin
| author | reimar |
|---|---|
| date | Tue, 11 Oct 2005 12:17:09 +0000 |
| parents | 2a7220c457a7 |
| children | 7b8deb8fe307 |
| files | libmpdvdkit2/common.h libmpdvdkit2/libdvdread_changes.diff |
| diffstat | 2 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdvdkit2/common.h Tue Oct 11 08:50:32 2005 +0000 +++ b/libmpdvdkit2/common.h Tue Oct 11 12:17:09 2005 +0000 @@ -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@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;
--- a/libmpdvdkit2/libdvdread_changes.diff Tue Oct 11 08:50:32 2005 +0000 +++ b/libmpdvdkit2/libdvdread_changes.diff Tue Oct 11 12:17:09 2005 +0000 @@ -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