diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
| commit | 724396e50bc811ea09416afbe00a8420d60647bf (patch) | |
| tree | fd5f6baeaad8ae7cc680dae46e1ae633544ee2a9 /xorg-server/xkb/XKBMisc.c | |
| parent | 2ddb9669098ba260d0667276b5d1e7999c72b993 (diff) | |
| parent | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (diff) | |
| download | vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.gz vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.bz2 vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/XKBMisc.c')
| -rw-r--r-- | xorg-server/xkb/XKBMisc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/xkb/XKBMisc.c b/xorg-server/xkb/XKBMisc.c index 867906046..c1a17c082 100644 --- a/xorg-server/xkb/XKBMisc.c +++ b/xorg-server/xkb/XKBMisc.c @@ -162,7 +162,7 @@ BOOL replicated = FALSE; syms= &xkb_syms_rtrn[XKB_OFFSET(i,0)]; if ((nSyms[i]>1)&&(syms[1]==NoSymbol)&&(syms[0]!=NoSymbol)) { KeySym upper,lower; - XConvertCase(syms[0],&lower,&upper); + XkbConvertCase(syms[0],&lower,&upper); if (upper!=lower) { xkb_syms_rtrn[XKB_OFFSET(i,0)]= lower; xkb_syms_rtrn[XKB_OFFSET(i,1)]= upper; @@ -175,11 +175,11 @@ BOOL replicated = FALSE; } } if (((protected&(1<<i))==0)&&(types_inout[i]==XkbTwoLevelIndex)) { - if (IsKeypadKey(syms[0])||IsKeypadKey(syms[1])) + if (XkbKSIsKeypad(syms[0])||XkbKSIsKeypad(syms[1])) types_inout[i]= XkbKeypadIndex; else { KeySym upper,lower; - XConvertCase(syms[0],&lower,&upper); + XkbConvertCase(syms[0],&lower,&upper); if ((syms[0]==lower)&&(syms[1]==upper)) types_inout[i]= XkbAlphabeticIndex; } @@ -388,7 +388,7 @@ unsigned changed,tmp; nSyms= XkbKeyNumSyms(xkb,key); syms= XkbKeySymsPtr(xkb,key); if (nSyms>IBUF_SIZE) { - interps= _XkbTypedCalloc(nSyms,XkbSymInterpretPtr); + interps= xcalloc(nSyms, sizeof(XkbSymInterpretPtr)); if (interps==NULL) { interps= ibuf; nSyms= IBUF_SIZE; |