summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-04 16:53:38 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-05-04 16:53:38 +0200
commit495e11fe13f33971a814d12336319ab7c3e486e4 (patch)
treeeac39eaf4a5fba28bca78925f44bbcfb5f15bcc6 /src
parent0cb0d3cadbd10a58e650fb0717be76114ddcfbe4 (diff)
parent103cacaacde15ad95564e3327c88ec135c91b230 (diff)
downloadxine-lib-495e11fe13f33971a814d12336319ab7c3e486e4.tar.gz
xine-lib-495e11fe13f33971a814d12336319ab7c3e486e4.tar.bz2
Merge - part 1.
Diffstat (limited to 'src')
-rw-r--r--src/input/input_cdda.c3
1 files changed, 3 insertions, 0 deletions
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) {