Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

This commit is contained in:
Alan Coopersmith 2006-06-20 16:03:34 -07:00
commit 63f6e6bbfd

View File

@ -78,10 +78,6 @@ static int ProcXagDispatch(ClientPtr client);
static int SProcXagDispatch(ClientPtr client); static int SProcXagDispatch(ClientPtr client);
static void XagResetProc(ExtensionEntry* extEntry); static void XagResetProc(ExtensionEntry* extEntry);
#if 0
static unsigned char XagReqCode = 0;
static int XagErrorBase;
#endif
static int XagCallbackRefCount = 0; static int XagCallbackRefCount = 0;
static RESTYPE RT_APPGROUP; static RESTYPE RT_APPGROUP;
@ -183,19 +179,6 @@ void XagClientStateChange(
void void
XagExtensionInit(INITARGS) XagExtensionInit(INITARGS)
{ {
#if 0
ExtensionEntry* extEntry;
if ((extEntry = AddExtension (XAGNAME,
0,
XagNumberErrors,
ProcXagDispatch,
SProcXagDispatch,
XagResetProc,
StandardMinorOpcode))) {
XagReqCode = (unsigned char)extEntry->base;
XagErrorBase = extEntry->errorBase;
#else
if (AddExtension (XAGNAME, if (AddExtension (XAGNAME,
0, 0,
XagNumberErrors, XagNumberErrors,
@ -203,7 +186,6 @@ XagExtensionInit(INITARGS)
SProcXagDispatch, SProcXagDispatch,
XagResetProc, XagResetProc,
StandardMinorOpcode)) { StandardMinorOpcode)) {
#endif
RT_APPGROUP = CreateNewResourceType (XagAppGroupFree); RT_APPGROUP = CreateNewResourceType (XagAppGroupFree);
XaceRegisterCallback(XACE_AUTH_AVAIL, XagCallClientStateChange, NULL); XaceRegisterCallback(XACE_AUTH_AVAIL, XagCallClientStateChange, NULL);
} }