From 3d92d4c0bc48ab413486caa01b8e86ce40379860 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Thu, 28 Apr 2011 14:08:03 +0000
Subject: [PATCH] fixed compile errors on Ubuntu 11.04

---
 modules/highgui/src/cap.cpp     | 2 +-
 modules/highgui/src/cap_v4l.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/highgui/src/cap.cpp b/modules/highgui/src/cap.cpp
index 807502ed03..5d50c3b38f 100644
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -173,7 +173,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
             if (capture)
                 return capture;
         #endif
-        #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2)
+        #if defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2)
             capture = cvCreateCameraCapture_V4L (index);
             if (capture)
                 return capture;
diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
index 11ea3c5a81..cf3ef89bec 100644
--- a/modules/highgui/src/cap_v4l.cpp
+++ b/modules/highgui/src/cap_v4l.cpp
@@ -202,7 +202,7 @@ make & enjoy!
 
 #include "precomp.hpp"
 
-#if !defined WIN32 && (defined HAVE_CAMV4L || defined HAVE_CAMV4L2)
+#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
 
 #define CLEAR(x) memset (&(x), 0, sizeof (x))