diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/input/input_cdda.c | 3 | ||||
| -rw-r--r-- | src/xine-utils/attributes.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 003af6722..389563fba 100644 --- a/configure.ac +++ b/configure.ac @@ -1656,7 +1656,7 @@ dnl cdrom ioctls dnl --------------------------------------------- AC_CHECK_HEADERS([linux/cdrom.h sys/dvdio.h], [break]) -AC_CHECK_HEADERS([sys/cdio.h]) +AC_CHECK_HEADERS([sys/cdio.h sys/scsiio.h]) AM_CHECK_CDROM_IOCTLS( [AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])], [AC_MSG_RESULT([*** (S)VCD support will be disabled ***])]) diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 7dd9ae21a..0b1f046e8 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -617,7 +617,10 @@ static int read_cdrom_frames(cdda_input_plugin_t *this_gen, int frame, int num_f #elif defined(__FreeBSD__) || defined(__NetBSD__) #include <sys/cdio.h> + +#ifdef HAVE_SYS_SCSIIO_H #include <sys/scsiio.h> +#endif static int read_cdrom_toc(int fd, cdrom_toc *toc) { diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h index b533286c8..13c787925 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -1,8 +1,10 @@ /* * attributes.h * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> + * Copyright (C) 2001-2007 xine developers * - * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. + * This file was originally part of mpeg2dec, a free MPEG-2 video stream + * decoder. * * mpeg2dec is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |