Bug#220232: Patch for videodev2.h time.h vs. linux/time.h problem.
Proposed patch for this issue, to go into debian/patches.
Simpler approach than Goswin's: in all known cases, videodev2.h has been the
problem. It appears to only need 'struct timeval'. 'struct timeval' is the
same size and shape in linux/time.h and in time.h. So I just made
videodev2.h include time.h when in userspace. Interestingly, this seems to
make videodev2.h nearly userspace-clean.
Please try this out to see if it solves the problems. And please add it to
the linux-kernel-headers package if appropriate. :-)
Ob-copyright: I disclaim all copyright interest in this trivial patch file and
give it to the public domain, if it isn't there already by virtue of its
triviality.
videodev2.h is needed in userspace by Video4Linux programs.
linux/time.h has a definition of 'struct timeval' which conflicts with the
one in time.h, even though it has the same fields with types of the same
lengths. So just use the userspace one in userspace!
--- include/linux/videodev2.h.orig 2003-10-15 11:13:17.000000000 -0400
+++ include/linux/videodev2.h 2003-11-20 21:11:02.000000000 -0500
@@ -13,7 +13,11 @@
* Justin Schoeman
* et al.
*/
+#ifdef __KERNEL__
#include <linux/time.h> /* need struct timeval */
+#elsef /* not __KERNEL__ */
+#include <time.h> /* need struct timeval */
+#endif /* __KERNEL__ */
/*
* M I S C E L L A N E O U S
Reply to: