45 lines
999 B
Diff
45 lines
999 B
Diff
From c5ca46c2d1be78c651afb843cc834cf2b5b24953 Mon Sep 17 00:00:00 2001
|
|
From: Julien BLACHE <jb@jblache.org>
|
|
Date: Wed, 16 Feb 2011 19:37:43 +0100
|
|
Subject: [PATCH] Fix v4l build with libv4l 0.8.3+
|
|
|
|
---
|
|
diff --git a/backend/v4l.c b/backend/v4l.c
|
|
index 6510ef0..38595ed 100644
|
|
--- a/backend/v4l.c
|
|
+++ b/backend/v4l.c
|
|
@@ -84,9 +84,8 @@
|
|
#include "../include/sane/sanei_config.h"
|
|
#define V4L_CONFIG_FILE "v4l.conf"
|
|
|
|
-#include "v4l.h"
|
|
-
|
|
#include <libv4l1.h>
|
|
+#include "v4l.h"
|
|
|
|
static const SANE_Device **devlist = NULL;
|
|
static int num_devices;
|
|
diff --git a/backend/v4l.h b/backend/v4l.h
|
|
index 588b96e..6aee586 100644
|
|
--- a/backend/v4l.h
|
|
+++ b/backend/v4l.h
|
|
@@ -29,6 +29,7 @@
|
|
#ifndef v4l_h
|
|
#define v4l_h
|
|
|
|
+#ifndef __LINUX_VIDEODEV_H
|
|
/* Kernel interface */
|
|
/* Only the stuff we need. For more features, more defines are needed */
|
|
|
|
@@ -165,7 +166,7 @@ struct video_channel
|
|
|
|
|
|
/* end of kernel interface */
|
|
-
|
|
+#endif /* !__LINUX_VIDEODEV_H */
|
|
|
|
#include <../include/sane/sane.h>
|
|
|
|
--
|
|
1.7.2.5
|
|
|