diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-28 13:34:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-03 08:51:11 +1000 |
| commit | cfd3443fe81685e91a53063dee58e24a5684dc29 (patch) | |
| tree | b2d66301e73bb5bbba67643f5ba5d45bb5fad825 | |
| parent | 8460425740c72e58bcb897557f033e2836251160 (diff) | |
Xext: rename saver's EventType to SaverEventType.
Avoid namespace clashing with the internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Xext/saver.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Xext/saver.c b/Xext/saver.c index 3aaec3405..cd6774928 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -142,7 +142,7 @@ static int ScreenSaverFreeSuspend( * entry from the per-screen queue. */ -static RESTYPE EventType; /* resource type for event masks */ +static RESTYPE SaverEventType; /* resource type for event masks */ typedef struct _ScreenSaverEvent *ScreenSaverEventPtr; @@ -253,7 +253,7 @@ ScreenSaverExtensionInit(INITARGS) ScreenPtr pScreen; AttrType = CreateNewResourceType(ScreenSaverFreeAttr); - EventType = CreateNewResourceType(ScreenSaverFreeEvents); + SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents); SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend); for (i = 0; i < screenInfo.numScreens; i++) @@ -261,7 +261,7 @@ ScreenSaverExtensionInit(INITARGS) pScreen = screenInfo.screens[i]; SetScreenPrivate (pScreen, NULL); } - if (AttrType && EventType && SuspendType && + if (AttrType && SaverEventType && SuspendType && (extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0, ProcScreenSaverDispatch, SProcScreenSaverDispatch, NULL, StandardMinorOpcode))) @@ -339,7 +339,7 @@ setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask) break; if (mask == 0) { - FreeResource (pEv->resource, EventType); + FreeResource (pEv->resource, SaverEventType); *pPrev = pEv->next; xfree (pEv); CheckScreenPrivate (pScreen); @@ -359,7 +359,7 @@ setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask) pEv->client = client; pEv->screen = pScreen; pEv->resource = FakeClientID (client->index); - if (!AddResource (pEv->resource, EventType, (pointer) pEv)) + if (!AddResource (pEv->resource, SaverEventType, (pointer) pEv)) return FALSE; } pEv->mask = mask; |