diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-14 09:38:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:38:56 +0100 |
| commit | 156e37d3879b316329e3e05579414031da2647e2 (patch) | |
| tree | 59fb1dce046fd3aab228e224bff8b0c1d074f876 /xkbcomp/alias.c | |
| parent | d783adea42f29bd7917929597ca1031b70587e1d (diff) | |
| download | vcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.gz vcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.bz2 vcxsrv-156e37d3879b316329e3e05579414031da2647e2.zip | |
libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update
14 nov 2011
Diffstat (limited to 'xkbcomp/alias.c')
| -rw-r--r-- | xkbcomp/alias.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xkbcomp/alias.c b/xkbcomp/alias.c index ba55d3d32..f28c2d286 100644 --- a/xkbcomp/alias.c +++ b/xkbcomp/alias.c @@ -215,10 +215,10 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) { if (strncmp(a->alias, info->alias, XkbKeyNameLength) == 0) { - AliasInfo old; - InitAliasInfo(&old, MergeAugment, 0, a->alias, a->real); - HandleCollision(&old, info); - memcpy(old.real, a->real, XkbKeyNameLength); + AliasInfo oldai; + InitAliasInfo(&oldai, MergeAugment, 0, a->alias, a->real); + HandleCollision(&oldai, info); + memcpy(oldai.real, a->real, XkbKeyNameLength); info->alias[0] = '\0'; nNew--; break; @@ -278,7 +278,7 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) if ((a - old) != (nOld + nNew)) { WSGO2("Expected %d aliases total but created %d\n", nOld + nNew, - a - old); + (int)(a - old)); } #endif if (toGeom) |