From 1857a0ca2018d19804d6b96cdfa7dcb50ab14ed1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 6 Sep 2008 14:46:56 +0200
Subject: [PATCH] Removed unneeded include files <linux/dvb/dmx.h> und <time.h>
 from remux.h

---
 CONTRIBUTORS | 1 +
 HISTORY      | 2 ++
 remux.h      | 4 +---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7d5e37bc..f4cbf23d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2119,6 +2119,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for making the non-breaking space symbol be rendered as a blank
  for fixing a signed character used as index in cBase64Encoder::NextLine()
  for fixing formatting the name section in the VDR man pages
+ for reporting unneeded include files <linux/dvb/dmx.h> und <time.h> in remux.h
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
diff --git a/HISTORY b/HISTORY
index 7966dd2e..a85d3891 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5756,3 +5756,5 @@ Video Disk Recorder Revision History
   to Udo Richter).
 - Replaced the Finnish language code "smi" with "suo" (thanks to Rolf Ahrenberg).
 - Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried Köhler).
+- Removed unneeded include files <linux/dvb/dmx.h> und <time.h> from remux.h
+  (reported by Tobias Grimm).
diff --git a/remux.h b/remux.h
index 1b7727ec..d36e8b0b 100644
--- a/remux.h
+++ b/remux.h
@@ -4,14 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.17 2007/09/02 10:19:06 kls Exp $
+ * $Id: remux.h 1.17.1.1 2008/09/06 14:34:42 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
-#include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!!
-#include <linux/dvb/dmx.h>
 #include "ringbuffer.h"
 #include "tools.h"