This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:

Subject: keytable: fix building without HAVE_BPF
Author:  Sean Young <s...@mess.org>
Date:    Sat Aug 10 17:09:29 2019 +0100

The struct raw_entry was defined in a BPF header file which was not
included. Spin it out to its own header file.

Signed-off-by: Sean Young <s...@mess.org>

 utils/keytable/Makefile.am |  2 +-
 utils/keytable/bpf_load.c  |  1 +
 utils/keytable/keymap.h    | 12 ++++++++++++
 utils/keytable/keytable.c  |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

---

http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=edea79a653acfc9aab6331296abd850a5a6873b0
diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am
index 2f265f126f43..18e6574e14f0 100644
--- a/utils/keytable/Makefile.am
+++ b/utils/keytable/Makefile.am
@@ -4,7 +4,7 @@ sysconf_DATA = rc_maps.cfg
 keytablesystem_DATA = $(srcdir)/rc_keymaps/*
 udevrules_DATA = 70-infrared.rules
 
-ir_keytable_SOURCES = keytable.c parse.h ir-encode.c ir-encode.h toml.c toml.h
+ir_keytable_SOURCES = keytable.c parse.h ir-encode.c ir-encode.h toml.c toml.h 
keymap.h
 
 if WITH_BPF
 ir_keytable_SOURCES += bpf.c bpf_load.c bpf.h bpf_load.h
diff --git a/utils/keytable/bpf_load.c b/utils/keytable/bpf_load.c
index 3187b9889f21..b6032ed1e9c7 100644
--- a/utils/keytable/bpf_load.c
+++ b/utils/keytable/bpf_load.c
@@ -14,6 +14,7 @@
 #include <linux/bpf.h>
 #include <assert.h>
 #include "toml.h"
+#include "keymap.h"
 #include "bpf.h"
 #include "bpf_load.h"
 
diff --git a/utils/keytable/keymap.h b/utils/keytable/keymap.h
new file mode 100644
index 000000000000..645a9bd06340
--- /dev/null
+++ b/utils/keytable/keymap.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __KEYMAP_H
+#define __KEYMAP_H
+
+struct raw_entry {
+       struct raw_entry *next;
+       u_int32_t scancode;
+       u_int32_t raw_length;
+       u_int32_t raw[1];
+};
+
+#endif
diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
index 4a7da63ddf97..3c4031b034b3 100644
--- a/utils/keytable/keytable.c
+++ b/utils/keytable/keytable.c
@@ -34,6 +34,7 @@
 #include "ir-encode.h"
 #include "parse.h"
 #include "toml.h"
+#include "keymap.h"
 
 #ifdef HAVE_BPF
 #include "bpf.h"

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to