1 From bf4a4a4e2b0479322fe16c9e1f15f146daa893ee Mon Sep 17 00:00:00 2001
2 From: Romain Naour <romain.naour@openwide.fr>
3 Date: Thu, 21 Aug 2014 18:18:16 +0200
4 Subject: [PATCH] rename log_msg to libinput_log_msg
6 This fixes a conflict between libevdev and libinput on the definition
7 of the log_msg() symbol.
9 http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
11 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
12 [yann.morin.1998@free.fr: rebase on-top of 0.6.0]
13 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
14 [ps.report@gmx.net: rebase on top of 0.7.0]
15 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
17 src/libinput-private.h | 14 +++++++-------
19 2 files changed, 8 insertions(+), 8 deletions(-)
21 diff --git a/src/libinput-private.h b/src/libinput-private.h
22 index b36dc95..98f91b3 100644
23 --- a/src/libinput-private.h
24 +++ b/src/libinput-private.h
25 @@ -179,15 +179,15 @@ struct libinput_event_listener {
26 typedef void (*libinput_source_dispatch_t)(void *data);
29 -#define log_debug(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
30 -#define log_info(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
31 -#define log_error(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
32 -#define log_bug_kernel(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
33 -#define log_bug_libinput(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__)
34 -#define log_bug_client(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__)
35 +#define log_debug(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
36 +#define log_info(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
37 +#define log_error(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, __VA_ARGS__)
38 +#define log_bug_kernel(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "kernel bug: " __VA_ARGS__)
39 +#define log_bug_libinput(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__)
40 +#define log_bug_client(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__)
43 -log_msg(struct libinput *libinput,
44 +libinput_log_msg(struct libinput *libinput,
45 enum libinput_log_priority priority,
46 const char *format, ...);
48 diff --git a/src/libinput.c b/src/libinput.c
49 index 279cce0..5748e5e 100644
52 @@ -107,7 +107,7 @@ log_msg_va(struct libinput *libinput,
56 -log_msg(struct libinput *libinput,
57 +libinput_log_msg(struct libinput *libinput,
58 enum libinput_log_priority priority,
59 const char *format, ...)