summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-01-04 17:02:30 +0000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-01-06 12:13:18 +1000
commit3804a0ee0bec455fcc61a469dd907738ff5589bd (patch)
tree3df0e4cc1d9ec58725dcfa4e5c0e902921724be7
parentc861d4568c2c6cc56db8e683a8d7035bef711262 (diff)
Constify priv->device
Fixes a compiler warning due to discarding the const qualifier as it comes back from the option code. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/properties.c2
-rw-r--r--src/synapticsstr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/properties.c b/src/properties.c
index f15a6fb..0a52801 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -315,7 +315,7 @@ InitDeviceProperties(InputInfoPtr pInfo)
prop_device_node = MakeAtom(XI_PROP_DEVICE_NODE, strlen(XI_PROP_DEVICE_NODE), TRUE);
XIChangeDeviceProperty(pInfo->dev, prop_device_node, XA_STRING, 8,
PropModeReplace, strlen(priv->device),
- priv->device, FALSE);
+ (pointer) priv->device, FALSE);
XISetDevicePropertyDeletable(pInfo->dev, prop_device_node, FALSE);
}
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 1ec8246..d74ebcd 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -185,7 +185,7 @@ typedef struct _SynapticsPrivateRec
struct SynapticsHwState hwState;
- char *device; /* device node */
+ const char *device; /* device node */
Bool shm_config; /* True when shared memory area allocated */
CARD32 timer_time; /* when timer last fired */