diff options
Diffstat (limited to 'xc/lib/Xt/TMkey.c')
| -rw-r--r-- | xc/lib/Xt/TMkey.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/xc/lib/Xt/TMkey.c b/xc/lib/Xt/TMkey.c index aa80f24d8..23fbb8692 100644 --- a/xc/lib/Xt/TMkey.c +++ b/xc/lib/Xt/TMkey.c @@ -55,6 +55,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/TMkey.c,v 3.8 2001/08/01 00:44:41 tsi Exp $ */ #define XK_MISCELLANY #define XK_LATIN1 @@ -64,11 +65,8 @@ in this Software without prior written authorization from The Open Group. #include "IntrinsicI.h" #include <X11/keysymdef.h> - -#ifdef __STDC__ -#define Const const -#else -#define Const /**/ +#ifdef XKB +#include <X11/XKBlib.h> #endif #define FLUSHKEYCACHE(ctx) \ @@ -82,7 +80,7 @@ in this Software without prior written authorization from The Open Group. */ #define FM(i) i >> (8 - TMKEYCACHELOG2) -static Const unsigned char modmix[256] = { +static const unsigned char modmix[256] = { FM(0x0f), FM(0x8f), FM(0x4f), FM(0xcf), FM(0x2f), FM(0xaf), FM(0x6f), FM(0xef), FM(0x1f), FM(0x9f), FM(0x5f), FM(0xdf), FM(0x3f), FM(0xbf), FM(0x7f), FM(0xff), FM(0x07), FM(0x87), FM(0x47), FM(0xc7), FM(0x27), FM(0xa7), FM(0x67), FM(0xe7), @@ -597,9 +595,7 @@ void XtTranslateKey(dpy, keycode, modifiers, } #else { - XkbLookupKeySym(dpy, keycode, modifiers, modifiers_return, - keysym_return); - return; + XkbLookupKeySym(dpy, keycode, modifiers, modifiers_return, keysym_return); } #endif |