[vlc-commits] Fix v4l2 build failure on Debian/kfreebsd

[Benjamin Drung]

vlc | branch: master | Benjamin Drung <bdrung at debian.org> | Sun Feb 26 18:22:40 2012 +0100| [7711eb75851df0dfcacecab5199bec5cff528ce8] | committer: Jean-Baptiste Kempf

Fix v4l2 build failure on Debian/kfreebsd

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7711eb75851df0dfcacecab5199bec5cff528ce8
---

 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 7e11709..51459d0 100644
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -40,11 +40,8 @@
 # define V4L2_STD_MTS (V4L2_STD_NTSC_M|V4L2_STD_PAL_M|V4L2_STD_PAL_N|\
                        V4L2_STD_PAL_Nc)
 #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)