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/media_helper.c | |
| 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/media_helper.c')
| -rw-r--r-- | src/input/media_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/media_helper.c b/src/input/media_helper.c index d2b1772a4..288ed4205 100644 --- a/src/input/media_helper.c +++ b/src/input/media_helper.c @@ -36,7 +36,7 @@ #include <unistd.h> #include <string.h> -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) #include <sys/cdio.h> /* CDIOCALLOW etc... */ #elif defined(HAVE_LINUX_CDROM_H) #include <linux/cdrom.h> @@ -130,7 +130,7 @@ int media_eject_media (xine_t *xine, const char *device) return 0; } -#elif defined (__NetBSD__) || defined (__OpenBSD__) || defined (__FreeBSD__) +#elif defined (__NetBSD__) || defined (__OpenBSD__) || defined (__FreeBSD_kernel__) if (ioctl(fd, CDIOCALLOW) == -1) { xprintf(xine, XINE_VERBOSITY_DEBUG, "ioctl(cdromallow): %s\n", strerror(errno)); |