diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-03 17:04:54 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-03 17:04:54 +1030 |
| commit | 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d (patch) | |
| tree | 092efcfc39e3e293baaf04c4c84027ee453d3e13 /Xext/xcmisc.c | |
| parent | eace88989c3b65d5c20e9f37ea9b23c7c8e19335 (diff) | |
| parent | ae869fc7669764729e13fdd70149ed636753f2a3 (diff) | |
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
Diffstat (limited to 'Xext/xcmisc.c')
| -rw-r--r-- | Xext/xcmisc.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 45450ef74..2f6208f1b 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -48,10 +48,6 @@ from The Open Group. #define UINT32_MAX 0xffffffffU #endif -#if 0 -static unsigned char XCMiscCode; -#endif - static void XCMiscResetProc( ExtensionEntry * /* extEntry */ ); @@ -68,20 +64,9 @@ static DISPATCH_PROC(SProcXCMiscGetXIDRange); void XCMiscExtensionInit(INITARGS) { -#if 0 - ExtensionEntry *extEntry; - - if ((extEntry = AddExtension(XCMiscExtensionName, 0, 0, - ProcXCMiscDispatch, SProcXCMiscDispatch, - XCMiscResetProc, StandardMinorOpcode)) != 0) - XCMiscCode = (unsigned char)extEntry->base; -#else - (void) AddExtension(XCMiscExtensionName, 0, 0, - ProcXCMiscDispatch, SProcXCMiscDispatch, - XCMiscResetProc, StandardMinorOpcode); -#endif - - DeclareExtensionSecurity(XCMiscExtensionName, TRUE); + AddExtension(XCMiscExtensionName, 0, 0, + ProcXCMiscDispatch, SProcXCMiscDispatch, + XCMiscResetProc, StandardMinorOpcode); } /*ARGSUSED*/ |