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

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb 28 18:28:47 2012 +0200| [70d74b7f1a9a425fe6fb07245d2b7ad6786d25ee] | committer: Rémi Denis-Courmont

Revert "Fix v4l2 build failure on Debian/kfreebsd"

This reverts commit 7711eb75851df0dfcacecab5199bec5cff528ce8.
This makes no sense as control types are _not_ macros.
(cherry picked from commit 74ba8ca7521d0dd984db899b7517e89a8737bc8d)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=70d74b7f1a9a425fe6fb07245d2b7ad6786d25ee
---

 modules/access/v4l2/v4l2.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h
index 43ad112..8b227d1 100644
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -33,8 +33,11 @@
 # warning Please update Video4Linux2 headers!
 # define V4L2_CTRL_FLAG_VOLATILE 0x0080
 #endif
-#ifndef V4L2_CTRL_TYPE_BITMASK /* 3.1 */
-# define V4L2_CTRL_TYPE_BITMASK 8
+#ifdef __linux__
+# include <linux/version.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
+#  define V4L2_CTRL_TYPE_BITMASK 8
+# endif
 #endif
 #ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */
 # define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)