diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-31 16:16:18 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-31 17:09:13 +1030 |
| commit | f781a752e642cfe7d08f841b332c3ae507315598 (patch) | |
| tree | 63a37822ab2538f5eb1afbaff190f54d83d37895 /Xi | |
| parent | 245d1c162c7b13c98a9a28dc7ad441366d7e8006 (diff) | |
Move MAX_DEVICES to misc.h, rename to MAXDEVICES for consistency.
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/extinit.c | 12 | ||||
| -rw-r--r-- | Xi/selectev.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c index 8b21bd998..e222de6ed 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -340,7 +340,7 @@ int RT_INPUTCLIENT; extern XExtensionVersion AllExtensionVersions[]; -Mask PropagateMask[MAX_DEVICES]; +Mask PropagateMask[MAXDEVICES]; /***************************************************************** * @@ -680,7 +680,7 @@ AllowPropagateSuppress(Mask mask) { int i; - for (i = 0; i < MAX_DEVICES; i++) + for (i = 0; i < MAXDEVICES; i++) PropagateMask[i] |= mask; } @@ -701,7 +701,7 @@ GetNextExtEventMask(void) } lastExtEventMask <<= 1; - for (i = 0; i < MAX_DEVICES; i++) + for (i = 0; i < MAXDEVICES; i++) ExtValidMasks[i] |= mask; return mask; } @@ -739,7 +739,7 @@ SetExclusiveAccess(Mask mask) { int i; - for (i = 0; i < MAX_DEVICES; i++) + for (i = 0; i < MAXDEVICES; i++) ExtExclusiveMasks[i] |= mask; } @@ -760,7 +760,7 @@ SetMaskForExtEvent(Mask mask, int event) if ((event < LASTEvent) || (event >= 128)) FatalError("MaskForExtensionEvent: bogus event number"); - for (i = 0; i < MAX_DEVICES; i++) + for (i = 0; i < MAXDEVICES; i++) SetMaskForEvent(i, mask, event); } @@ -914,7 +914,7 @@ RestoreExtensionEvents(void) for (i = 0; i < ExtEventIndex - 1; i++) { if ((EventInfo[i].type >= LASTEvent) && (EventInfo[i].type < 128)) { - for (j = 0; j < MAX_DEVICES; j++) + for (j = 0; j < MAXDEVICES; j++) SetMaskForEvent(j, 0, EventInfo[i].type); } EventInfo[i].mask = 0; diff --git a/Xi/selectev.c b/Xi/selectev.c index 53d8f7408..9c336fce5 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -106,10 +106,10 @@ HandleDevicePresenceMask(ClientPtr client, WindowPtr win, if (mask == 0) return Success; - /* We always only use mksidx = MAX_DEVICES for events not bound to + /* We always only use mksidx = MAXDEVICES for events not bound to * devices */ - if (AddExtensionClient (win, client, mask, MAX_DEVICES) != Success) + if (AddExtensionClient (win, client, mask, MAXDEVICES) != Success) return BadAlloc; RecalculateDeviceDeliverableEvents(win); |