qcap: Fix compilation on systems that have v4l1 but not VIDIOCMCAPTURE & co. (try2)

Francois Gouget fgouget at free.fr
Wed Mar 6 08:11:40 CST 2013


---

Alexandre Julliard wrote:
> It's not very useful to add a configure check for a #define, you can 
> check for it directly.

Good point. For the first patch I had started modifying the way we 
detect the v4l1 headers but then decided not to since other parts of 
qcap can use them even if they don't define VIDIOCMCAPTURE. But by that 
time I was working on autoconf and inadvertantly kept banging the same 
nail.

 dlls/qcap/v4l.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
index 41cc752..0880499 100644
--- a/dlls/qcap/v4l.c
+++ b/dlls/qcap/v4l.c
@@ -71,7 +71,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l);
 
-#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H)
+#ifdef VIDIOCMCAPTURE
 
 static typeof(open) *video_open = open;
 static typeof(close) *video_close = close;
@@ -973,4 +973,4 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state)
     FAIL_WITH_ERR;
 }
 
-#endif /* HAVE_LINUX_VIDEODEV_H || HAVE_LINUX_LIBV4L1_H */
+#endif /* defined(VIDIOCMCAPTURE) */
-- 
1.7.10.4




More information about the wine-patches mailing list