• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/libinput/0001-rename-log_msg-to-libinput_log_msg.patch
Bernd KuhlsBernd Kuhls committed 5101ea58d5214 Nov 2015
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
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
5
​
6
This fixes a conflict between libevdev and libinput on the definition
7
of the log_msg() symbol.
8
​
9
http://autobuild.buildroot.net/results/c13/c133b7c706ee31302125df8ca94f4d0f0152c6c6/build-end.log
10
​
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>
16
---
17
 src/libinput-private.h | 14 +++++++-------
18
 src/libinput.c         |  2 +-
19
 2 files changed, 8 insertions(+), 8 deletions(-)
20
​
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
@@ -259,12 +259,12 @@
26
 
27
 typedef void (*libinput_source_dispatch_t)(void *data);
28
 
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__)
41
 
42
 #define log_debug_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
43
 #define log_info_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__)
44
@@ -281,7 +281,7 @@
45
    LIBINPUT_ATTRIBUTE_PRINTF(4, 5);
46
 
47
 void
48
-log_msg(struct libinput *libinput,
49
+libinput_log_msg(struct libinput *libinput,
50
    enum libinput_log_priority priority,
51
    const char *format, ...)
52
    LIBINPUT_ATTRIBUTE_PRINTF(3, 4);
53
diff --git a/src/libinput.c b/src/libinput.c
54
index 279cce0..5748e5e 100644
55
--- a/src/libinput.c
56
+++ b/src/libinput.c
57
@@ -155,7 +155,7 @@
58
 }
59
 
60
 void
61
-log_msg(struct libinput *libinput,
62
+libinput_log_msg(struct libinput *libinput,
63
    enum libinput_log_priority priority,
64
    const char *format, ...)
65
 {
66
@@ -184,7 +184,7 @@
67
    va_end(args);
68
 
69
    if (state == RATELIMIT_THRESHOLD)
70
-       log_msg(libinput,
71
+       libinput_log_msg(libinput,
72
            priority,
73
            "WARNING: log rate limit exceeded (%d msgs per %dms). Discarding future messages.\n",
74
            ratelimit->burst,
75
-- 
76
2.1.2
77
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.