diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-04 16:45:59 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-04 16:45:59 +0200 |
| commit | 103cacaacde15ad95564e3327c88ec135c91b230 (patch) | |
| tree | ce32e7119a745f85ea6be84c49d34251892eda19 | |
| parent | c81f80094b17f05a3e526893a9a21cc9fea87638 (diff) | |
| download | xine-lib-103cacaacde15ad95564e3327c88ec135c91b230.tar.gz xine-lib-103cacaacde15ad95564e3327c88ec135c91b230.tar.bz2 | |
Fix building of CDDA input on FreeBSD, the NetBSD patch broke it as sys/scsiio.h is not present on FreeBSD.
| -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 b43bd1b8f..a37988d24 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) { |