[Xorg-commit] xc/programs/Xserver/xkb xkb.c,1.1.4.2,1.1.4.3 xkbInit.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/xkb
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/xkb

Modified Files:
      Tag: XORG-CURRENT
	xkb.c xkbInit.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: xkb.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/xkb/xkb.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xkb.c	26 Nov 2003 22:49:07 -0000	1.1.4.2
+++ b/xkb.c	23 Feb 2004 21:37:29 -0000	1.1.4.3
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.23 2003/12/22 17:48:11 tsi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -2307,8 +2307,7 @@
 	    stuff->maxKeyCode= xkb->max_key_code;
 	}
 	else {
-	    if ((stuff->minKeyCode<XkbMinLegalKeyCode)||
-				(stuff->maxKeyCode>XkbMaxLegalKeyCode)) {
+	    if (!XkbIsLegalKeycode(stuff->minKeyCode)) {
 		client->errorValue= _XkbErrCode3(2,stuff->minKeyCode,
 							stuff->maxKeyCode);
 		return BadValue;

Index: xkbInit.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/xkb/xkbInit.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xkbInit.c	26 Nov 2003 22:49:07 -0000	1.1.4.2
+++ b/xkbInit.c	23 Feb 2004 21:37:29 -0000	1.1.4.3
@@ -24,7 +24,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.32 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.33 2003/12/22 17:48:12 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -716,7 +716,7 @@
 
     if (ok && (finfo.xkb!=NULL)) {
 	XkbDescPtr	xkb;
-	int		minKC,maxKC;
+	KeyCode		minKC,maxKC;
 
 	xkb= finfo.xkb;
 	minKC= xkb->min_key_code;