diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-25 21:22:23 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-25 21:22:23 +0000 |
| commit | b16de9c5e59ce99cba75f51cde8f2c441d36e55b (patch) | |
| tree | d9ba24b391a016967e370c95cce8883b85d06e19 /src/input/libdvdnav | |
| parent | abdd7c762e646a27d0db6951364148163a0d7925 (diff) | |
| parent | 0e2e43f9050cde0fd5c34d4848cda31bb4ef6a2e (diff) | |
| download | xine-lib-b16de9c5e59ce99cba75f51cde8f2c441d36e55b.tar.gz xine-lib-b16de9c5e59ce99cba75f51cde8f2c441d36e55b.tar.bz2 | |
Merge from 1.1.
Some fixups were required for the kfreebsd patch; needs testing.
--HG--
rename : src/video_out/libdha/ports.c => contrib/libdha/ports.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
Diffstat (limited to 'src/input/libdvdnav')
| -rw-r--r-- | src/input/libdvdnav/dvd_reader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c index 1cf493ef1..200a1dbec 100644 --- a/src/input/libdvdnav/dvd_reader.c +++ b/src/input/libdvdnav/dvd_reader.c @@ -58,7 +58,7 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz ) #define lseek64 _lseeki64 #endif -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) +#if defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) #define SYS_BSD 1 #endif |