diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-10 14:56:23 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-10 14:56:23 +0000 |
| commit | d1f409719c704b502427b67f75b3073cd25ff302 (patch) | |
| tree | 17b1e380506a1ec91e98dafa08b76f24dd6a6e67 /stream | |
| parent | 793eb3b6819e57285413aaca02fd4abd934b0e68 (diff) | |
| download | mpv-d1f409719c704b502427b67f75b3073cd25ff302.tar.bz2 mpv-d1f409719c704b502427b67f75b3073cd25ff302.tar.xz | |
GNU/kFreeBSD support, closes Bugzilla #704.
patch by Petr Salinger, Petr.Salinger seznam cz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21866 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_cddb.c | 4 | ||||
| -rw-r--r-- | stream/stream_vcd.c | 6 | ||||
| -rw-r--r-- | stream/tvi_bsdbt848.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index c5e3d26859..28b2687020 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -41,7 +41,7 @@ #if defined(__linux__) #include <linux/cdrom.h> -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #include <sys/cdio.h> #elif defined(WIN32) #include <ddk/ntddcdrm.h> @@ -110,7 +110,7 @@ read_toc(const char *dev) { cdtoc[i].sec = tocentry.cdte_addr.msf.second; cdtoc[i].frame = tocentry.cdte_addr.msf.frame; } -#elif defined(__FreeBSD__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) { struct ioc_toc_header tochdr; ioctl(drive, CDIOREADTOCHEADER, &tochdr); diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 528a8d43d2..9af85ce2e8 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -13,7 +13,7 @@ #include <sys/ioctl.h> #include <errno.h> -#if defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <sys/cdrio.h> #include "vcd_read_fbsd.h" #elif defined(__NetBSD__) || defined (__OpenBSD__) @@ -71,7 +71,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { struct stream_priv_s* p = (struct stream_priv_s*)opts; int ret,ret2,f; mp_vcd_priv_t* vcd; -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) int bsize = VCD_SECTOR_SIZE; #endif @@ -119,7 +119,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { } mp_msg(MSGT_OPEN,MSGL_V,"VCD start byte position: 0x%X end: 0x%X\n",ret,ret2); -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) if (ioctl (f, CDRIOCSETBLOCKSIZE, &bsize) == -1) { mp_msg(MSGT_OPEN,MSGL_WARN,"Error in CDRIOCSETBLOCKSIZE"); } diff --git a/stream/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c index a3b528fd6d..a3aa489db0 100644 --- a/stream/tvi_bsdbt848.c +++ b/stream/tvi_bsdbt848.c @@ -44,7 +44,7 @@ #elif defined(__DragonFly__) #include <dev/video/meteor/ioctl_meteor.h> #include <dev/video/bktr/ioctl_bt848.h> -#elif __FreeBSD_version >= 502100 +#elif (__FreeBSD_version >= 502100) || defined(__FreeBSD_kernel__) #include <dev/bktr/ioctl_meteor.h> #include <dev/bktr/ioctl_bt848.h> #else |