summaryrefslogtreecommitdiff
path: root/geometry.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-01-29 08:09:12 +0000
committerEgbert Eich <eich@suse.de>2004-01-29 08:09:12 +0000
commitdbba2cffbc57e5bbdec8f24417a8a5dcfef7c2a2 (patch)
tree341ab3c80f9fd4decdaeb50d9449d5542cec2dbf /geometry.c
parent8aa5bcfe58d3776746d7b0d627f2fb8744fb0817 (diff)
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004xf86-4_3_99_903_specialxf86-012804-2330
Diffstat (limited to 'geometry.c')
-rw-r--r--geometry.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/geometry.c b/geometry.c
index 6a249de..9d73361 100644
--- a/geometry.c
+++ b/geometry.c
@@ -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++;