From a0b4a1330be6a36ad095222d2ea83927cd33514d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 25 Nov 2011 08:22:48 +0100
Subject: mesa xserver pixman git update 25 nov 2011

---
 xorg-server/Xi/extinit.c    | 4 ++--
 xorg-server/Xi/xiproperty.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'xorg-server/Xi')

diff --git a/xorg-server/Xi/extinit.c b/xorg-server/Xi/extinit.c
index 7724f5f5a..a2c807b46 100644
--- a/xorg-server/Xi/extinit.c
+++ b/xorg-server/Xi/extinit.c
@@ -162,7 +162,7 @@ Mask ExtExclusiveMasks[EMASKSIZE];
 static struct dev_type
 {
     Atom type;
-    char *name;
+    const char *name;
 } dev_type[] = {
     {
     0, XI_KEYBOARD}, {
@@ -1127,7 +1127,7 @@ IResetProc(ExtensionEntry * unused)
  */
 
 void
-AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
+AssignTypeAndName(DeviceIntPtr dev, Atom type, const char *name)
 {
     dev->xinput_type = type;
     dev->name = strdup(name);
diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c
index 14f1491b6..88de11959 100644
--- a/xorg-server/Xi/xiproperty.c
+++ b/xorg-server/Xi/xiproperty.c
@@ -48,7 +48,7 @@
 static struct dev_properties
 {
     Atom type;
-    char *name;
+    const char *name;
 } dev_properties[] = {
     {0, XI_PROP_ENABLED},
     {0, XI_PROP_XTEST_DEVICE},
@@ -386,7 +386,7 @@ change_property(ClientPtr client, DeviceIntPtr dev, Atom property, Atom type,
  * If name is NULL, None is returned.
  */
 Atom
-XIGetKnownProperty(char *name)
+XIGetKnownProperty(const char *name)
 {
     int i;
 
-- 
cgit v1.2.3