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/symbols.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/symbols.c')
| -rw-r--r-- | xkbcomp/symbols.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xkbcomp/symbols.c b/xkbcomp/symbols.c index 5547999b5..d43ba9ffb 100644 --- a/xkbcomp/symbols.c +++ b/xkbcomp/symbols.c @@ -928,7 +928,7 @@ GetGroupIndex(KeyInfo * key, static Bool AddSymbolsToKey(KeyInfo * key, XkbDescPtr xkb, - char *field, + const char *field, ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) { unsigned ndx, nSyms; @@ -982,7 +982,7 @@ AddSymbolsToKey(KeyInfo * key, static Bool AddActionsToKey(KeyInfo * key, XkbDescPtr xkb, - char *field, + const char *field, ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) { register int i; @@ -1118,7 +1118,7 @@ static LookupEntry rgEntries[] = { static Bool SetSymbolsField(KeyInfo * key, XkbDescPtr xkb, - char *field, + const char *field, ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) { Bool ok = True; @@ -1235,7 +1235,7 @@ SetSymbolsField(KeyInfo * key, uStrCasePrefix("permanentoverlay", field)) { Bool permanent = False; - char *which; + const char *which; int overlayNdx; if (uStrCasePrefix("permanent", field)) { |