diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-15 15:32:11 +1000 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-01-25 09:26:40 +1300 |
commit | c8076f317ee5044ed3cc21b097f8b1741af8e0f1 (patch) | |
tree | 5b08eaf97ed6915272d529a8231b7021765a8a4e | |
parent | d627dd9d1ef436b01f0581e40a6736ffc6b5d2c8 (diff) |
xkb: remove XConvertCase.
Since it's typedef'd to XkbConvertCase anyway and the headers are now split
from the client headers, simply get rid of it altogether.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r-- | include/xkbsrv.h | 1 | ||||
-rw-r--r-- | xkb/XKBMisc.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h index b1df0d30c..af8df2fb8 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -310,7 +310,6 @@ extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease; #define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress)) #define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease)) -#define XConvertCase(s,l,u) XkbConvertCase(s,l,u) #undef IsKeypadKey #define IsKeypadKey(s) XkbKSIsKeypad(s) diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 71fa04467..55def7c62 100644 --- a/xkb/XKBMisc.c +++ b/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; @@ -179,7 +179,7 @@ BOOL replicated = FALSE; 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; } |