diff options
| author | Egbert Eich <eich@suse.de> | 2004-01-29 08:08:57 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-01-29 08:08:57 +0000 |
| commit | 3c64b65d805915e5c5628663113c54c3e9c3013b (patch) | |
| tree | dff84b1be15ae6a4658af2168ca50278bf044b5a /xkb | |
| parent | 2ec70aa70133190ad31a83114fdb9a218e6aa8e6 (diff) | |
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004xf86-012804-2330
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkb.c | 5 | ||||
| -rw-r--r-- | xkb/xkbInit.c | 4 |
2 files changed, 4 insertions, 5 deletions
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH 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 @@ ProcXkbSetMap(ClientPtr client) 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; diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 064311d5e..6ed146494 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH 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 @@ XkbRF_VarDefsRec defs; if (ok && (finfo.xkb!=NULL)) { XkbDescPtr xkb; - int minKC,maxKC; + KeyCode minKC,maxKC; xkb= finfo.xkb; minKC= xkb->min_key_code; |