diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-11 12:17:09 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-11 12:17:09 +0000 |
| commit | 7f6177e9486b8c36ed8fefdded7a42493205ff83 (patch) | |
| tree | f006d0df7ccf0a435b4d5de684190b551cacfb98 /libmpdvdkit2 | |
| parent | 9087410ec7c5e4dfcb4591b8a11df08b3d2b97bd (diff) | |
| download | mpv-7f6177e9486b8c36ed8fefdded7a42493205ff83.tar.bz2 mpv-7f6177e9486b8c36ed8fefdded7a42493205ff83.tar.xz | |
Compile fix: _lseeki64 is not available under cygwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16727 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2')
| -rw-r--r-- | libmpdvdkit2/common.h | 6 | ||||
| -rw-r--r-- | libmpdvdkit2/libdvdread_changes.diff | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/libmpdvdkit2/common.h b/libmpdvdkit2/common.h index 534b0e514d..67b4a97810 100644 --- a/libmpdvdkit2/common.h +++ b/libmpdvdkit2/common.h @@ -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; diff --git a/libmpdvdkit2/libdvdread_changes.diff b/libmpdvdkit2/libdvdread_changes.diff index 1cfc8c0277..20d297cb94 100644 --- a/libmpdvdkit2/libdvdread_changes.diff +++ b/libmpdvdkit2/libdvdread_changes.diff @@ -70,6 +70,21 @@ diff -Naur dvdread.orig/bswap.h dvdread/bswap.h 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 |