summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_dvb.c7
-rw-r--r--src/input/input_dvd.c12
2 files changed, 10 insertions, 9 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 39507ac15..10d6eca55 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -986,8 +986,13 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters
if (poll(pfd,1,3000)){
if (pfd[0].revents & POLLIN){
- if (ioctl(this->fd_frontend, FE_GET_EVENT, &event) == -EOVERFLOW){
+#ifdef EOVERFLOW
+ if (ioctl(this->fd_frontend, FE_GET_EVENT, &event) == -EOVERFLOW) {
print_error("EOVERFLOW");
+#else
+ if (ioctl(this->fd_frontend, FE_GET_EVENT, &event) == -EINVAL) {
+ print_error("EINVAL");
+#endif
return 0;
}
if (event.parameters.frequency <= 0)
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 */