vlc/vlc-2.0 | branch: master | Benjamin Drung <[email protected]> | Sun Feb 26 18:22:40 2012 +0100| [c10f9d2fd9e213bcf750b8fdb327da8005dacf3b] | committer: Jean-Baptiste Kempf
Fix v4l2 build failure on Debian/kfreebsd Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit 7711eb75851df0dfcacecab5199bec5cff528ce8) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=c10f9d2fd9e213bcf750b8fdb327da8005dacf3b --- modules/access/v4l2/v4l2.h | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h index 8b227d1..43ad112 100644 --- a/modules/access/v4l2/v4l2.h +++ b/modules/access/v4l2/v4l2.h @@ -33,11 +33,8 @@ # warning Please update Video4Linux2 headers! # define V4L2_CTRL_FLAG_VOLATILE 0x0080 #endif -#ifdef __linux__ -# include <linux/version.h> -# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) -# define V4L2_CTRL_TYPE_BITMASK 8 -# endif +#ifndef V4L2_CTRL_TYPE_BITMASK /* 3.1 */ +# define V4L2_CTRL_TYPE_BITMASK 8 #endif #ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */ # define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
