diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-20 14:55:51 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-25 14:58:08 +1000 |
| commit | 5672e2d66444be74125c71b81373b82f8e1b7dd2 (patch) | |
| tree | 812a5369eb51dcc28e044488fe8ddb95a7924661 | |
| parent | 59bc615ed2e60c595887dcc11fe04935b49bcaff (diff) | |
Xi: remove AllExtensionVersions.
Keeping an AllExtensionVersions array to save all versions of
all extension is rather pointless if only one extension uses it.
Rename to XIVersion, reduce to a single struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Xi/extinit.c | 4 | ||||
| -rw-r--r-- | Xi/getvers.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c index 78f216803..9a20bfdc3 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -343,7 +343,7 @@ int RT_INPUTCLIENT; * */ -extern XExtensionVersion AllExtensionVersions[]; +extern XExtensionVersion XIVersion; Mask PropagateMask[MAXDEVICES]; @@ -1092,7 +1092,7 @@ XInputExtensionInit(void) if (extEntry) { IReqCode = extEntry->base; IEventBase = extEntry->eventBase; - AllExtensionVersions[IReqCode - 128] = thisversion; + XIVersion = thisversion; MakeDeviceTypeAtoms(); RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone); RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT"); diff --git a/Xi/getvers.c b/Xi/getvers.c index b4bc468ea..2ca3bb3f4 100644 --- a/Xi/getvers.c +++ b/Xi/getvers.c @@ -62,7 +62,7 @@ SOFTWARE. #include "getvers.h" -XExtensionVersion AllExtensionVersions[128]; +XExtensionVersion XIVersion; /*********************************************************************** * @@ -122,8 +122,8 @@ ProcXGetExtensionVersion(ClientPtr client) rep.length = 0; rep.sequenceNumber = client->sequence; rep.present = TRUE; - rep.major_version = AllExtensionVersions[IReqCode - 128].major_version; - rep.minor_version = AllExtensionVersions[IReqCode - 128].minor_version; + rep.major_version = XIVersion.major_version; + rep.minor_version = XIVersion.minor_version; WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep); |