diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:37:57 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:37:57 +0000 |
| commit | 5be0ac3f15b0de8981560ada5939e11a62a9d326 (patch) | |
| tree | 7855ec988df805a874719cefe4bc5c23a490c4f0 /geometry.c | |
| parent | c3753ba83fc9f3ae414a5a70819d6f30433d9308 (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGE
Diffstat (limited to 'geometry.c')
| -rw-r--r-- | geometry.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.5 2003/08/06 14:04:05 eich Exp $ */ +/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.6 2003/12/22 17:48:13 tsi Exp $ */ #include "xkbcomp.h" #include "tokens.h" @@ -438,8 +438,10 @@ DoodadInfo * dflt; di->section= si; if (si!=NULL) { di->priority= si->nextDoodadPriority++; +#if XkbGeomMaxPriority < 255 if (si->nextDoodadPriority>XkbGeomMaxPriority) si->nextDoodadPriority= XkbGeomMaxPriority; +#endif } else { di->priority= info->nextPriority++; |