[PATCH 28/37] xfree86/common: handle string constants in xf86Xinput configuration

Keith Packard keithp at keithp.com
Sun Nov 17 00:01:53 PST 2013


Signed-off-by: Keith Packard <keithp at keithp.com>
---
 hw/xfree86/common/xf86Xinput.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index f563052..5b0b6a1 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -539,7 +539,7 @@ MatchAttrToken(const char *attr, struct xorg_list *patterns,
      * match. Each list entry is a separate Match line of the same type.
      */
     xorg_list_for_each_entry(group, patterns, entry) {
-        char *const *cur;
+        const char *const *cur;
         Bool match = FALSE;
 
         for (cur = group->values; *cur; cur++)
@@ -598,7 +598,7 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
      * See if any of the device's tags match any of the MatchTag tokens.
      */
     if (!xorg_list_is_empty(&iclass->match_tag)) {
-        char *const *tag;
+        const char *const *tag;
         Bool match;
 
         if (!attrs->tags)
-- 
1.8.4.2



More information about the xorg-devel mailing list