aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-11 19:58:46 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 12:55:04 +0200
commitad90098f107832c9e975fb9780ea3dbecb4a0d56 (patch)
treecd723fd2624390aaa7a77714693fb6941b6e487e /nx-X11
parent238a4b68197bce7c99d37cbefedde2a1b824a9b2 (diff)
downloadnx-libs-ad90098f107832c9e975fb9780ea3dbecb4a0d56.tar.gz
nx-libs-ad90098f107832c9e975fb9780ea3dbecb4a0d56.tar.bz2
nx-libs-ad90098f107832c9e975fb9780ea3dbecb4a0d56.zip
Xext: rename saver's EventType to SaverEventType.
Backport of this xorg-xserver commit: commit cfd3443fe81685e91a53063dee58e24a5684dc29 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Jan 28 13:34:10 2009 +1000 Xext: rename saver's EventType to SaverEventType. Avoid namespace clashing with the internal events. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/Xext/saver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index a068b25ee..671e31e20 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -148,7 +148,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;
@@ -256,7 +256,7 @@ ScreenSaverExtensionInit(void)
ScreenPtr pScreen;
AttrType = CreateNewResourceType(ScreenSaverFreeAttr);
- EventType = CreateNewResourceType(ScreenSaverFreeEvents);
+ SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents);
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend);
ScreenPrivateIndex = AllocateScreenPrivateIndex ();
@@ -265,7 +265,7 @@ ScreenSaverExtensionInit(void)
pScreen = screenInfo.screens[i];
SetScreenPrivate (pScreen, NULL);
}
- if (AttrType && EventType && SuspendType && ScreenPrivateIndex != -1 &&
+ if (AttrType && SaverEventType && SuspendType && ScreenPrivateIndex != -1 &&
(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
ScreenSaverResetProc, StandardMinorOpcode)))
@@ -360,7 +360,7 @@ setEventMask (pScreen, client, mask)
break;
if (mask == 0)
{
- FreeResource (pEv->resource, EventType);
+ FreeResource (pEv->resource, SaverEventType);
*pPrev = pEv->next;
free (pEv);
CheckScreenPrivate (pScreen);
@@ -380,7 +380,7 @@ setEventMask (pScreen, client, mask)
pEv->client = client;
pEv->screen = pScreen;
pEv->resource = FakeClientID (client->index);
- if (!AddResource (pEv->resource, EventType, (void *) pEv))
+ if (!AddResource (pEv->resource, SaverEventType, (void *) pEv))
return FALSE;
}
pEv->mask = mask;