aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/XKBMisc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-25 07:52:57 +0000
committermarha <marha@users.sourceforge.net>2010-01-25 07:52:57 +0000
commita0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (patch)
tree3b69fe26769dc019dba91d2da08a2639ddd31e41 /xorg-server/xkb/XKBMisc.c
parenta9768b035f2c47be0908520474073cc68d225d8a (diff)
downloadvcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.gz
vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.tar.bz2
vcxsrv-a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a.zip
Git update 25/1/2010
Diffstat (limited to 'xorg-server/xkb/XKBMisc.c')
-rw-r--r--xorg-server/xkb/XKBMisc.c8
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;