From 103cacaacde15ad95564e3327c88ec135c91b230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 4 May 2007 16:45:59 +0200 Subject: Fix building of CDDA input on FreeBSD, the NetBSD patch broke it as sys/scsiio.h is not present on FreeBSD. --- configure.ac | 2 +- src/input/input_cdda.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 + +#ifdef HAVE_SYS_SCSIIO_H #include +#endif static int read_cdrom_toc(int fd, cdrom_toc *toc) { -- cgit v1.2.3