diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:53 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:53 +0000 |
| commit | 3c11a74e83b9383b6c230c8432e7137e19326ef3 (patch) | |
| tree | 4dc294caaf71b13c1ad846c8468a9922de7ad7cf /geometry.c | |
| parent | a153e2624e9e3e7b06fad207e8855bea617ac088 (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-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.5tsi 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++; |