From 150ac24d20c71d5ebf3358fbc779e916623b6d91 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:26:30 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- XKB.h | 5 +++-- XKBgeom.h | 2 +- XKBsrv.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/XKB.h b/XKB.h index 8867c47..d0d13f2 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.5tsi 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. diff --git a/XKBgeom.h b/XKBgeom.h index f8f7e31..89f902f 100644 --- a/XKBgeom.h +++ b/XKBgeom.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/XKBgeom.h,v 3.10 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.9 2002/09/18 17:11:40 tsi Exp $ */ #ifndef _XKBGEOM_H_ #define _XKBGEOM_H_ diff --git a/XKBsrv.h b/XKBsrv.h index bfbc7bc..3376d39 100644 --- a/XKBsrv.h +++ b/XKBsrv.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/XKBsrv.h,v 3.23 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */ #ifndef _XKBSRV_H_ #define _XKBSRV_H_ -- cgit v1.2.1