summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-08-19 06:48:06 +0000
committerKevin E Martin <kem@kem.org>2004-08-19 06:48:06 +0000
commite689746c8d0e21e9011e8b91a3071d235d3a2a74 (patch)
treee51a8af39cfe0f27cf060fcd8126a0d32c477414
parentd558a53a6f57eecfcaadce5141fe3a08860defcb (diff)
downloadxorg-lib-libX11-e689746c8d0e21e9011e8b91a3071d235d3a2a74.tar.gz
Fix header file to #ifdef the XKB keysyms when they are used. This fixes the X test suite build failure.XORG-6_7_99_903
-rw-r--r--include/X11/Xutil.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/X11/Xutil.h b/include/X11/Xutil.h
index 931cfd0f..82dab7d5 100644
--- a/include/X11/Xutil.h
+++ b/include/X11/Xutil.h
@@ -247,12 +247,19 @@ typedef struct _XComposeStatus {
#define IsMiscFunctionKey(keysym) \
(((KeySym)(keysym) >= XK_Select) && ((KeySym)(keysym) <= XK_Break))
+#ifdef XK_XKB_KEYS
#define IsModifierKey(keysym) \
((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \
|| (((KeySym)(keysym) >= XK_ISO_Lock) && \
((KeySym)(keysym) <= XK_ISO_Last_Group_Lock)) \
|| ((KeySym)(keysym) == XK_Mode_switch) \
|| ((KeySym)(keysym) == XK_Num_Lock))
+#else
+#define IsModifierKey(keysym) \
+ ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \
+ || ((KeySym)(keysym) == XK_Mode_switch) \
+ || ((KeySym)(keysym) == XK_Num_Lock))
+#endif
/*
* opaque reference to Region data type
*/