diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-04 16:53:38 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-04 16:53:38 +0200 |
| commit | 495e11fe13f33971a814d12336319ab7c3e486e4 (patch) | |
| tree | eac39eaf4a5fba28bca78925f44bbcfb5f15bcc6 | |
| parent | 0cb0d3cadbd10a58e650fb0717be76114ddcfbe4 (diff) | |
| parent | 103cacaacde15ad95564e3327c88ec135c91b230 (diff) | |
| download | xine-lib-495e11fe13f33971a814d12336319ab7c3e486e4.tar.gz xine-lib-495e11fe13f33971a814d12336319ab7c3e486e4.tar.bz2 | |
Merge - part 1.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/input/input_cdda.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 961698141..9389c792e 100644 --- a/configure.ac +++ b/configure.ac @@ -1702,7 +1702,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 fe4c7f932..80f0bda39 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -621,7 +621,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) { |