1 From 2a789161ef17ac1cedd9a4eb11423f6c1020d8d9 Mon Sep 17 00:00:00 2001
2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3 Date: Sun, 17 May 2015 16:08:15 +0200
4 Subject: [PATCH] Fix loglevel redefinition in static library builds
6 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
9 tools/irrecord.c | 5 ++---
10 2 files changed, 2 insertions(+), 4 deletions(-)
12 diff --git a/daemons/lircmd.c b/daemons/lircmd.c
13 index 023777c..e69078c 100644
14 --- a/daemons/lircmd.c
15 +++ b/daemons/lircmd.c
16 @@ -67,7 +67,6 @@ typedef uint64_t __u64;
18 static int uinputfd = -1;
19 static int useuinput = 0;
20 -loglevel_t loglevel = 0;
23 static const struct option lircmd_options[] = {
24 diff --git a/tools/irrecord.c b/tools/irrecord.c
25 index f52328c..772b090 100644
26 --- a/tools/irrecord.c
27 +++ b/tools/irrecord.c
28 @@ -113,9 +113,6 @@ lirc_t aeps = 100;
32 -// Actual loglevel as per -D option, see lirc_log.h.
33 -loglevel_t loglevel = LIRC_WARNING;
37 struct ir_remote *emulation_data;
38 @@ -407,6 +404,8 @@ int main(int argc, char **argv)
39 char commandline[128];
41 int get_pre = 0, get_post = 0, test = 0, invert = 0, trail = 0;
42 + // Actual loglevel as per -D option, see lirc_log.h.
43 + loglevel_t loglevel = LIRC_WARNING;
45 get_commandline(argc, argv, commandline, sizeof(commandline));