diff options
author | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
commit | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (patch) | |
tree | 38fa447dc8970b83becb4d35487d2bb2e565301b /xkbcomp/action.c | |
parent | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (diff) | |
parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
download | vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.gz vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.bz2 vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
Conflicts:
xorg-server/Xext/shm.c
xorg-server/os/xstrans.c
Diffstat (limited to 'xkbcomp/action.c')
-rw-r--r-- | xkbcomp/action.c | 8 |
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; |