summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:33:49 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:33:49 +0000
commit5c4753f11a817e968bff5a85942ff47d38562c20 (patch)
tree8b77e01f50e6319f4ec96127d9882487d45fd1cf
parent17f9321b3ef7aab3b8757ab04e9a493ccfcb8e88 (diff)
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
-rw-r--r--XKB.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/XKB.h b/XKB.h
index 8867c47..59ccc7d 100644
--- a/XKB.h
+++ b/XKB.h
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/include/extensions/XKB.h,v 1.5 2002/11/20 04:49:01 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XKB.h,v 1.6 2003/12/22 17:48:02 tsi Exp $ */
#ifndef _XKB_H_
#define _XKB_H_
@@ -549,7 +549,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbMaxLegalKeyCode 255
#define XkbMaxKeyCount (XkbMaxLegalKeyCode-XkbMinLegalKeyCode+1)
#define XkbPerKeyBitArraySize ((XkbMaxLegalKeyCode+1)/8)
-#define XkbIsLegalKeycode(k) (((k)>=XkbMinLegalKeyCode)&&((k)<=XkbMaxLegalKeyCode))
+/* Seems kinda silly to check that an unsigned char is <= 255... */
+#define XkbIsLegalKeycode(k) ((k)>=XkbMinLegalKeyCode)
/*
* Assorted constants and limits.