From e579abc24a62762e54d191679a96dccd97141b4d Mon Sep 17 00:00:00 2001 From: Juergen Keil Date: Tue, 13 Aug 2002 16:04:27 +0000 Subject: Solaris uses for CDROM/DVD-ROM ioctl, too. Try to use autoconf HAVE_headerfile macros... (The xxxBSD part nees a bit work) CVS patchset: 2448 CVS date: 2002/08/13 16:04:27 --- src/input/input_dvd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 9524a2d63..cceaa5217 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.59 2002/08/13 15:55:23 mroi Exp $ + * $Id: input_dvd.c,v 1.60 2002/08/13 16:04:27 jkeil Exp $ * */ @@ -57,8 +57,10 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) #include #include /* CDIOCALLOW etc... */ -#elif defined(__linux__) +#elif defined(HAVE_LINUX_CDROM_H) #include +#elif defined(HAVE_SYS_CDIO_H) +#include #else #warning "This might not compile due to missing cdrom ioctls" #endif @@ -1397,6 +1399,10 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { /* * $Log: input_dvd.c,v $ + * Revision 1.60 2002/08/13 16:04:27 jkeil + * Solaris uses for CDROM/DVD-ROM ioctl, too. Try to use autoconf + * HAVE_headerfile macros... (The xxxBSD part nees a bit work) + * * Revision 1.59 2002/08/13 15:55:23 mroi * change error to warning * -- cgit v1.2.3