diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-27 15:40:31 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-03 08:51:11 +1000 |
| commit | faeb18eb7eb20f15528f9c8004d843146ebc2a50 (patch) | |
| tree | e7c58b5b652923e164516154287fab547a4e88eb | |
| parent | cfd3443fe81685e91a53063dee58e24a5684dc29 (diff) | |
Xext: rename shape's EventType to ShapeEventType to avoid name clashing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Xext/shape.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Xext/shape.c b/Xext/shape.c index 8827a0274..fbf8f8c6d 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -95,7 +95,7 @@ static DISPATCH_PROC(SProcShapeSelectInput); #endif static int ShapeEventBase = 0; -static RESTYPE ClientType, EventType; /* resource types for event masks */ +static RESTYPE ClientType, ShapeEventType; /* resource types for event masks */ /* * each window has a list of clients requesting @@ -128,8 +128,8 @@ ShapeExtensionInit(void) ExtensionEntry *extEntry; ClientType = CreateNewResourceType(ShapeFreeClient); - EventType = CreateNewResourceType(ShapeFreeEvents); - if (ClientType && EventType && + ShapeEventType = CreateNewResourceType(ShapeFreeEvents); + if (ClientType && ShapeEventType && (extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0, ProcShapeDispatch, SProcShapeDispatch, NULL, StandardMinorOpcode))) @@ -741,7 +741,7 @@ ShapeFreeClient (pointer data, XID id) pShapeEvent = (ShapeEventPtr) data; pWin = pShapeEvent->window; - pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, EventType); + pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, ShapeEventType); if (pHead) { pPrev = 0; for (pCur = *pHead; pCur && pCur != pShapeEvent; pCur=pCur->next) @@ -788,7 +788,7 @@ ProcShapeSelectInput (ClientPtr client) if (rc != Success) return rc; pHead = (ShapeEventPtr *)SecurityLookupIDByType(client, - pWin->drawable.id, EventType, DixWriteAccess); + pWin->drawable.id, ShapeEventType, DixWriteAccess); switch (stuff->enable) { case xTrue: if (pHead) { @@ -828,7 +828,7 @@ ProcShapeSelectInput (ClientPtr client) { pHead = xalloc (sizeof (ShapeEventPtr)); if (!pHead || - !AddResource (pWin->drawable.id, EventType, (pointer)pHead)) + !AddResource (pWin->drawable.id, ShapeEventType, (pointer)pHead)) { FreeResource (clientResource, RT_NONE); return BadAlloc; @@ -878,7 +878,7 @@ SendShapeNotify (WindowPtr pWin, int which) RegionPtr region; BYTE shaped; - pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, EventType); + pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, ShapeEventType); if (!pHead) return; switch (which) { @@ -957,7 +957,7 @@ ProcShapeInputSelected (ClientPtr client) if (rc != Success) return rc; pHead = (ShapeEventPtr *) SecurityLookupIDByType(client, - pWin->drawable.id, EventType, DixReadAccess); + pWin->drawable.id, ShapeEventType, DixReadAccess); enabled = xFalse; if (pHead) { for (pShapeEvent = *pHead; |