aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/action.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-04 12:08:23 +0100
committermarha <marha@users.sourceforge.net>2013-11-04 12:08:23 +0100
commit31fd4c5654595a4763e492e4ec26f66ca3a8a405 (patch)
tree8d6b249c93725e838676e26af171a167f6f20903 /xkbcomp/action.c
parente4ef724e06621be9325fc41ed886fd404467fdc0 (diff)
downloadvcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.tar.gz
vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.tar.bz2
vcxsrv-31fd4c5654595a4763e492e4ec26f66ca3a8a405.zip
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
xserver commit 33c85beed521c9db140cadd8c5aa9992398ee1fe xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943 pixman commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218 libxtrans commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a fontconfig commit 767108aa1327cf0156dfc6f024dbc8fb783ae067 mesa commit 2f896627175384fd5943f21804700a155ba4e8a0
Diffstat (limited to 'xkbcomp/action.c')
-rw-r--r--xkbcomp/action.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xkbcomp/action.c b/xkbcomp/action.c
index 3b82e647e..4623c0caf 100644
--- a/xkbcomp/action.c
+++ b/xkbcomp/action.c
@@ -41,7 +41,7 @@ static ExprDef constFalse;
/***====================================================================***/
static Bool
-stringToAction(char *str, unsigned *type_rtrn)
+stringToAction(const char *str, unsigned *type_rtrn)
{
if (str == NULL)
return False;
@@ -134,7 +134,7 @@ stringToAction(char *str, unsigned *type_rtrn)
}
static Bool
-stringToField(char *str, unsigned *field_rtrn)
+stringToField(const char *str, unsigned *field_rtrn)
{
if (str == NULL)
@@ -1397,8 +1397,8 @@ HandleActionDef(ExprDef * def,
int
SetActionField(XkbDescPtr xkb,
- char *elem,
- char *field,
+ const char *elem,
+ const char *field,
ExprDef * array_ndx, ExprDef * value, ActionInfo ** info_rtrn)
{
ActionInfo *new, *old;