diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-29 20:35:28 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-29 20:35:28 +0100 |
| commit | 9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b (patch) | |
| tree | 8ecff5b5aa6da25c8c4feb97c8b3f4dfb04ae76c /src | |
| parent | 51ee5df118326a3d2374f2432fff63dd3edceaf6 (diff) | |
| parent | c41975a7b4ca8e473979bfa13229f6077b951697 (diff) | |
| download | xine-lib-9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b.tar.gz xine-lib-9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/input_vcd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index c1d2d0ece..4f9c75cd2 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -93,7 +93,7 @@ typedef struct { #if defined (__linux__) || defined(__sun) struct cdrom_tochdr tochdr; struct cdrom_tocentry tocent[100]; -#elif (defined(BSD) && BSD >= 199306) +#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) struct ioc_toc_header tochdr; struct cd_toc_entry *tocent; off_t cur_sec; @@ -118,7 +118,7 @@ typedef struct { int cur_track; -#if defined (__linux__) || defined(__sun) || (defined(BSD) && BSD >= 199306) +#if defined (__linux__) || defined(__sun) || defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) uint8_t cur_min, cur_sec, cur_frame; #endif @@ -178,7 +178,7 @@ static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { return 0; } -#elif (defined(BSD) && BSD >= 199306) +#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { struct ioc_read_toc_entry te; @@ -395,7 +395,7 @@ static off_t vcd_plugin_read (input_plugin_t *this_gen, memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */ return VCDSECTORSIZE; } -#elif (defined(BSD) && BSD >= 199306) +#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_read (input_plugin_t *this_gen, void *buf_gen, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; @@ -535,7 +535,7 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */ return buf; } -#elif (defined(BSD) && BSD >= 199306) +#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t nlen) { @@ -694,7 +694,7 @@ static off_t vcd_plugin_seek (input_plugin_t *this_gen, return offset ; /* FIXME */ } -#elif (defined(BSD) && BSD >= 199306) +#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { @@ -768,7 +768,7 @@ static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { return (off_t) 0; } -#elif (defined(BSD) && BSD >= 199306) +#elif defined (__FreeBSD_kernel__) || (defined(BSD) && BSD >= 199306) static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; off_t len ; |