diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2002-08-13 16:04:27 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2002-08-13 16:04:27 +0000 |
| commit | e579abc24a62762e54d191679a96dccd97141b4d (patch) | |
| tree | 163a901f84d0910ee06065cacb0dd0b64fd3964a | |
| parent | ff2527b9cb1861f4fefdc94b35137f5762f8164a (diff) | |
| download | xine-lib-e579abc24a62762e54d191679a96dccd97141b4d.tar.gz xine-lib-e579abc24a62762e54d191679a96dccd97141b4d.tar.bz2 | |
Solaris uses <sys/cdio.h> 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
| -rw-r--r-- | src/input/input_dvd.c | 10 |
1 files 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 <sys/dvdio.h> #include <sys/cdio.h> /* CDIOCALLOW etc... */ -#elif defined(__linux__) +#elif defined(HAVE_LINUX_CDROM_H) #include <linux/cdrom.h> +#elif defined(HAVE_SYS_CDIO_H) +#include <sys/cdio.h> #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 <sys/cdio.h> 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 * |