# HG changeset patch
# User diego
# Date 1060961155 0
# Node ID 9f4af7d95d87e8d35d32c9b0c91143272a183b5d
# Parent  5702e1e3a74dfa7d8fdfeeb36eb4751ff6728362
this small patch allows to compile the file libmpdemux/tvi_v4l.c properly,
when the Linux is patched with the V4L2 patch, which automatically
includes <linux/videodev2.h> when you include <linux/videodev.h>.
It is necessary then to prevent <linux/time.h> from including (by defining
the _LINUX_TIME_H macro) in order to resolve some collisions and it is
also necessary to prevent the defining of "struct v4l2_capability" and
"VIDIOC_QUERYCAP" in libmpdemux/tvi_v4l.c, when they are allready defined
in the <linux/videodev2.h>.

Patch by Martin Drab <drab@kepler.fjfi.cvut.cz>, checked by Arpi.

diff -r 5702e1e3a74d -r 9f4af7d95d87 libmpdemux/tvi_v4l.c
--- a/libmpdemux/tvi_v4l.c	Fri Aug 15 14:43:57 2003 +0000
+++ b/libmpdemux/tvi_v4l.c	Fri Aug 15 15:25:55 2003 +0000
@@ -26,6 +26,10 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/time.h>
+
+/* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */
+#define _LINUX_TIME_H
+
 #include <linux/videodev.h>
 #include <unistd.h>
 #include <sys/mman.h>
@@ -404,6 +408,7 @@
     }
 }
 
+#ifndef __LINUX_VIDEODEV2_H
 struct v4l2_capability
 {
         __u8    driver[16];     /* i.e. "bttv" */
@@ -415,6 +420,7 @@
 };
 
 #define VIDIOC_QUERYCAP         _IOR  ('V',  0, struct v4l2_capability)
+#endif
 
 static int init(priv_t *priv)
 {