mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 08:04:30 +00:00
Merge branch 'master' into mpx
Conflicts: XTrap/xtrapddmi.c Xext/security.c Xext/xprint.c Xext/xtest.c Xext/xvdisp.c Xi/exevents.c Xi/grabdevb.c Xi/grabdevk.c Xi/opendev.c Xi/ungrdev.c Xi/ungrdevb.c Xi/ungrdevk.c dix/cursor.c dix/devices.c dix/dixutils.c dix/events.c dix/getevents.c dix/main.c dix/window.c hw/xfree86/ramdac/xf86Cursor.c include/dix.h include/input.h include/inputstr.h mi/midispcur.c mi/miinitext.c mi/misprite.c render/animcur.c xfixes/cursor.c xkb/xkbAccessX.c
This commit is contained in:
@@ -41,10 +41,6 @@ from The Open Group.
|
||||
#include "opaque.h"
|
||||
#include "modinit.h"
|
||||
|
||||
#if 0
|
||||
static unsigned char XBigReqCode;
|
||||
#endif
|
||||
|
||||
static void BigReqResetProc(
|
||||
ExtensionEntry * /* extEntry */
|
||||
);
|
||||
@@ -54,20 +50,9 @@ static DISPATCH_PROC(ProcBigReqDispatch);
|
||||
void
|
||||
BigReqExtensionInit(INITARGS)
|
||||
{
|
||||
#if 0
|
||||
ExtensionEntry *extEntry;
|
||||
|
||||
if ((extEntry = AddExtension(XBigReqExtensionName, 0, 0,
|
||||
ProcBigReqDispatch, ProcBigReqDispatch,
|
||||
BigReqResetProc, StandardMinorOpcode)) != 0)
|
||||
XBigReqCode = (unsigned char)extEntry->base;
|
||||
#else
|
||||
(void) AddExtension(XBigReqExtensionName, 0, 0,
|
||||
ProcBigReqDispatch, ProcBigReqDispatch,
|
||||
BigReqResetProc, StandardMinorOpcode);
|
||||
#endif
|
||||
|
||||
DeclareExtensionSecurity(XBigReqExtensionName, TRUE);
|
||||
AddExtension(XBigReqExtensionName, 0, 0,
|
||||
ProcBigReqDispatch, ProcBigReqDispatch,
|
||||
BigReqResetProc, StandardMinorOpcode);
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
|
||||
Reference in New Issue
Block a user