summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/xkbsrv.h3
-rw-r--r--xkb/XKBMisc.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index af8df2fb8..ed3779a21 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -310,9 +310,6 @@ extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease;
#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
-#undef IsKeypadKey
-#define IsKeypadKey(s) XkbKSIsKeypad(s)
-
#define Status int
#ifndef True
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 55def7c62..c1a17c082 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -175,7 +175,7 @@ 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;