diff options
author | marha <marha@users.sourceforge.net> | 2011-05-05 13:26:25 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-05-05 13:26:25 +0000 |
commit | 092ee086db2b206b1959247e01cf43daf565d6c1 (patch) | |
tree | c65e20b56ed101ccd70fe8e0cffdb25ae8a87731 /libX11/src | |
parent | d7c078e18995b7160a2dfa782ef5aab465396d3d (diff) | |
parent | d40f0a49c88fc7b5162a9d8f7b64b571094e8593 (diff) | |
download | vcxsrv-092ee086db2b206b1959247e01cf43daf565d6c1.tar.gz vcxsrv-092ee086db2b206b1959247e01cf43daf565d6c1.tar.bz2 vcxsrv-092ee086db2b206b1959247e01cf43daf565d6c1.zip |
Bumped version to 1.10.11.10.1
Added release note
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src')
-rw-r--r-- | libX11/src/xkb/XKBGeom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/src/xkb/XKBGeom.c b/libX11/src/xkb/XKBGeom.c index 065285fcb..d8fe3ce32 100644 --- a/libX11/src/xkb/XKBGeom.c +++ b/libX11/src/xkb/XKBGeom.c @@ -108,7 +108,6 @@ XkbBoundsPtr bounds,sbounds; if ((!geom)||(!section)||(!row))
return False;
- pos= 0;
bounds= &row->bounds;
bzero(bounds,sizeof(XkbBoundsRec));
for (key=row->keys,pos=k=0;k<row->num_keys;k++,key++) {
@@ -143,7 +142,7 @@ register int i; XkbShapePtr shape;
XkbRowPtr row;
XkbDoodadPtr doodad;
-XkbBoundsPtr bounds,rbounds=NULL;
+XkbBoundsPtr bounds,rbounds;
if ((!geom)||(!section))
return False;
@@ -182,6 +181,7 @@ XkbBoundsPtr bounds,rbounds=NULL; default:
tbounds.x1= tbounds.x2= doodad->any.left;
tbounds.y1= tbounds.y2= doodad->any.top;
+ rbounds= &tbounds;
break;
}
_XkbCheckBounds(bounds,rbounds->x1,rbounds->y1);
|