From: Bernhard Froehlich <decke@bluelife.at>
Date: Sun, 2 Jun 2013 09:30:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' after all FreeBSD
X-Git-Tag: v3.9~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7082d8da7777c08cbafb8bfb263b86ab31b2cf02;p=thirdparty%2Ftvheadend.git

Merge remote-tracking branch 'upstream/master' after all FreeBSD
related changes have been merged from upstream.
---

7082d8da7777c08cbafb8bfb263b86ab31b2cf02
diff --cc src/dvb/dvb_adapter.c
index ff10cb1d7,93f06cdbd..de4a59a59
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@@ -47,14 -47,8 +47,15 @@@
  #include "epggrab.h"
  #include "diseqc.h"
  #include "atomic.h"
+ #include "tvhpoll.h"
  
 +#if ENABLE_EPOLL
 +#include <sys/epoll.h>
 +#elif ENABLE_KQUEUE
 +#include <sys/event.h>
 +#include <sys/time.h>
 +#endif
 +
  struct th_dvb_adapter_queue dvb_adapters;
  struct th_dvb_mux_instance_tree dvb_muxes;
  static void *dvb_adapter_input_dvr(void *aux);