diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-15 07:50:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-15 07:50:39 +0000 |
| commit | 6412df1b3df28c6213b43821c4a98cc3857d9a3f (patch) | |
| tree | d26e725c65f2166ac78d4ee4e56176712a563483 /xorg-server/Xext | |
| parent | b71f397671d4b467bfac21f208d54d2dc507969c (diff) | |
| download | vcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.tar.gz vcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.tar.bz2 vcxsrv-6412df1b3df28c6213b43821c4a98cc3857d9a3f.zip | |
Git update 15/4/2010
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/geext.c | 13 | ||||
| -rw-r--r-- | xorg-server/Xext/geint.h | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/xorg-server/Xext/geext.c b/xorg-server/Xext/geext.c index 2ba0ca824..f0a3d8778 100644 --- a/xorg-server/Xext/geext.c +++ b/xorg-server/Xext/geext.c @@ -36,11 +36,8 @@ #define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) -int GEEventBase; -int GEErrorBase; static int GEClientPrivateKeyIndex; DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex; -int GEEventType; /* The opcode for all GenericEvents will have. */ int RT_GECLIENT = 0; @@ -178,10 +175,6 @@ GEResetProc(ExtensionEntry *extEntry) { DeleteCallback(&ClientStateCallback, GEClientCallback, 0); EventSwapVector[GenericEvent] = NotImplemented; - - GEEventBase = 0; - GEErrorBase = 0; - GEEventType = 0; } /* Calls the registered event swap function for the extension. @@ -225,14 +218,10 @@ GEExtensionInit(void) } if((extEntry = AddExtension(GE_NAME, - GENumberEvents, GENumberErrors, + 0, GENumberErrors, ProcGEDispatch, SProcGEDispatch, GEResetProc, StandardMinorOpcode)) != 0) { - GEEventBase = extEntry->eventBase; - GEErrorBase = extEntry->errorBase; - GEEventType = GEEventBase; - memset(GEExtensions, 0, sizeof(GEExtensions)); EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent; diff --git a/xorg-server/Xext/geint.h b/xorg-server/Xext/geint.h index 881d30661..10a33cea3 100644 --- a/xorg-server/Xext/geint.h +++ b/xorg-server/Xext/geint.h @@ -37,9 +37,6 @@ #include "extnsionst.h" #include <X11/extensions/geproto.h> -extern _X_EXPORT int GEEventType; -extern _X_EXPORT int GEEventBase; -extern _X_EXPORT int GEErrorBase; extern _X_EXPORT DevPrivateKey GEClientPrivateKey; typedef struct _GEClientInfo { |