diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 14:01:47 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 14:01:47 +0200 |
| commit | 60a408c3446733dc752979c1eab579c25a4a4897 (patch) | |
| tree | f897ecb51396ecf9f61c0f4219bf6f5a6287d380 /src/input/input_dvd.c | |
| parent | 15d6933ee064a25f1b9753841fb87f261ea3e736 (diff) | |
| parent | bdbfc75de59531f8a4d8d85b7e0e58c95365cbd7 (diff) | |
| download | xine-lib-60a408c3446733dc752979c1eab579c25a4a4897.tar.gz xine-lib-60a408c3446733dc752979c1eab579c25a4a4897.tar.bz2 | |
Merge from main repo.
Diffstat (limited to 'src/input/input_dvd.c')
| -rw-r--r-- | src/input/input_dvd.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 944ae88bd..de47de0d5 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -64,21 +64,17 @@ #endif /* WIN32 */ -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(HAVE_LINUX_CDROM_H) +#include <linux/cdrom.h> +#elif defined(HAVE_SYS_DVDIO_H) #include <sys/dvdio.h> #include <sys/cdio.h> /* CDIOCALLOW etc... */ -#elif defined(HAVE_LINUX_CDROM_H) -#include <linux/cdrom.h> #elif defined(HAVE_SYS_CDIO_H) #include <sys/cdio.h> -#else - -#ifdef WIN32 +#elif defined(WIN32) #include <io.h> /* read() */ #else #warning "This might not compile due to missing cdrom ioctls" -#endif /* WIN32 */ - #endif /* DVDNAV includes */ |