Bug #3334: Clean up remnants from the PEX, XIE, and BEZIER extensions.
This commit is contained in:
Adam Jackson
parent
1e51e18382
commit
ef4401ff8a
|
|
@ -330,9 +330,6 @@ LOOKUP dixLookupTab[] = {
|
|||
SYMVAR(noTestExtensions)
|
||||
SYMFUNC(GiveUp)
|
||||
|
||||
#ifdef BEZIER
|
||||
SYMVAR(noBezierExtension)
|
||||
#endif
|
||||
#ifdef BIGREQS
|
||||
SYMVAR(noBigReqExtension)
|
||||
#endif
|
||||
|
|
@ -393,9 +390,6 @@ LOOKUP dixLookupTab[] = {
|
|||
#ifdef TOGCUP
|
||||
SYMVAR(noXcupExtension)
|
||||
#endif
|
||||
#ifdef PEXEXT
|
||||
SYMVAR(noPexExtension)
|
||||
#endif
|
||||
#ifdef RES
|
||||
SYMVAR(noResExtension)
|
||||
#endif
|
||||
|
|
@ -408,9 +402,6 @@ LOOKUP dixLookupTab[] = {
|
|||
#ifdef XEVIE
|
||||
SYMVAR(noXevieExtension)
|
||||
#endif
|
||||
#ifdef XIE
|
||||
SYMVAR(noXie)
|
||||
#endif
|
||||
#ifdef XF86BIGFONT
|
||||
SYMVAR(noXFree86BigfontExtension)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.4 2004/07/31 09:14:06 kem Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.5 2004/09/14 00:51:24 gisburn Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
|
||||
|
||||
#ifndef _XSERV_GLOBAL_H_
|
||||
|
|
@ -48,10 +48,6 @@ extern Bool PanoramiXWindowExposureSent;
|
|||
extern Bool PanoramiXOneExposeRequest;
|
||||
#endif
|
||||
|
||||
#ifdef BEZIER
|
||||
extern Bool noBezierExtension;
|
||||
#endif
|
||||
|
||||
#ifdef BIGREQS
|
||||
extern Bool noBigReqExtension;
|
||||
#endif
|
||||
|
|
@ -132,10 +128,6 @@ extern Bool noSyncExtension;
|
|||
extern Bool noXcupExtension;
|
||||
#endif
|
||||
|
||||
#ifdef PEXEXT
|
||||
extern Bool noPexExtension;
|
||||
#endif
|
||||
|
||||
#ifdef RES
|
||||
extern Bool noResExtension;
|
||||
#endif
|
||||
|
|
@ -152,10 +144,6 @@ extern Bool noXCMiscExtension;
|
|||
extern Bool noXevieExtension;
|
||||
#endif
|
||||
|
||||
#ifdef XIE
|
||||
extern Bool noXie;
|
||||
#endif
|
||||
|
||||
#ifdef XF86BIGFONT
|
||||
extern Bool noXFree86BigfontExtension;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -52,13 +52,7 @@ SOFTWARE.
|
|||
#include "extension.h"
|
||||
#include "micmap.h"
|
||||
|
||||
#ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */
|
||||
#undef PEXEXT
|
||||
#endif
|
||||
|
||||
#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
|
||||
#undef PEXEXT
|
||||
#undef XIE
|
||||
#undef GLXEXT
|
||||
#endif
|
||||
|
||||
|
|
@ -68,7 +62,6 @@ SOFTWARE.
|
|||
#undef XKB
|
||||
#undef PANORAMIX
|
||||
#undef RES
|
||||
#undef XIE
|
||||
#undef XINPUT
|
||||
#undef XV
|
||||
#undef SCREENSAVER
|
||||
|
|
@ -93,9 +86,6 @@ SOFTWARE.
|
|||
|
||||
extern Bool noTestExtensions;
|
||||
|
||||
#ifdef BEZIER
|
||||
extern Bool noBezierExtension;
|
||||
#endif
|
||||
#ifdef BIGREQS
|
||||
extern Bool noBigReqExtension;
|
||||
#endif
|
||||
|
|
@ -156,9 +146,6 @@ extern Bool noSyncExtension;
|
|||
#ifdef TOGCUP
|
||||
extern Bool noXcupExtension;
|
||||
#endif
|
||||
#ifdef PEXEXT
|
||||
extern Bool noPexExtension;
|
||||
#endif
|
||||
#ifdef RES
|
||||
extern Bool noResExtension;
|
||||
#endif
|
||||
|
|
@ -171,9 +158,6 @@ extern Bool noXCMiscExtension;
|
|||
#ifdef XEVIE
|
||||
extern Bool noXevieExtension;
|
||||
#endif
|
||||
#ifdef XIE
|
||||
extern Bool noXie;
|
||||
#endif
|
||||
#ifdef XF86BIGFONT
|
||||
extern Bool noXFree86BigfontExtension;
|
||||
#endif
|
||||
|
|
@ -253,9 +237,6 @@ typedef void (*InitExtension)(INITARGS);
|
|||
#endif
|
||||
|
||||
/* FIXME: this whole block of externs should be from the appropriate headers */
|
||||
#ifdef BEZIER
|
||||
extern void BezierExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XTESTEXT1
|
||||
extern void XTestExtension1Init(INITARGS);
|
||||
#endif
|
||||
|
|
@ -268,9 +249,6 @@ extern void EVIExtensionInit(INITARGS);
|
|||
#ifdef MITSHM
|
||||
extern void ShmExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef PEXEXT
|
||||
extern void PexExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef MULTIBUFFER
|
||||
extern void MultibufferExtensionInit(INITARGS);
|
||||
#endif
|
||||
|
|
@ -302,9 +280,6 @@ extern void ScreenSaverExtensionInit (INITARGS);
|
|||
extern void XvExtensionInit(INITARGS);
|
||||
extern void XvMCExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XIE
|
||||
extern void XieInit(INITARGS);
|
||||
#endif
|
||||
#ifdef XSYNC
|
||||
extern void SyncExtensionInit(INITARGS);
|
||||
#endif
|
||||
|
|
@ -404,9 +379,6 @@ typedef struct {
|
|||
static ExtensionToggle ExtensionToggleList[] =
|
||||
{
|
||||
/* sort order is extension name string as shown in xdpyinfo */
|
||||
#ifdef BEZIER
|
||||
{ "BEZIER", &noBezierExtension },
|
||||
#endif
|
||||
#ifdef BIGREQS
|
||||
{ "BIG-REQUESTS", &noBigReqExtension },
|
||||
#endif
|
||||
|
|
@ -467,9 +439,6 @@ static ExtensionToggle ExtensionToggleList[] =
|
|||
#ifdef TOGCUP
|
||||
{ "TOG-CUP", &noXcupExtension },
|
||||
#endif
|
||||
#ifdef PEXEXT
|
||||
{ "X3D-PEX", &noPexExtension },
|
||||
#endif
|
||||
#ifdef RES
|
||||
{ "X-Resource", &noResExtension },
|
||||
#endif
|
||||
|
|
@ -500,9 +469,6 @@ static ExtensionToggle ExtensionToggleList[] =
|
|||
#ifdef XFIXES
|
||||
{ "XFIXES", &noXFixesExtension },
|
||||
#endif
|
||||
#ifdef XIE
|
||||
{ "XIE", &noXie },
|
||||
#endif
|
||||
#ifdef PANORAMIX
|
||||
{ "XINERAMA", &noPanoramiXExtension },
|
||||
#endif
|
||||
|
|
@ -557,9 +523,6 @@ InitExtensions(argc, argv)
|
|||
if (!noPanoramiXExtension) PanoramiXExtensionInit();
|
||||
# endif
|
||||
#endif
|
||||
#ifdef BEZIER
|
||||
if (!noBezierExtension) BezierExtensionInit();
|
||||
#endif
|
||||
#ifdef XTESTEXT1
|
||||
if (!noTestExtensions) XTestExtension1Init();
|
||||
#endif
|
||||
|
|
@ -572,9 +535,6 @@ InitExtensions(argc, argv)
|
|||
#ifdef EVI
|
||||
if (!noEVIExtension) EVIExtensionInit();
|
||||
#endif
|
||||
#ifdef PEXEXT
|
||||
if (!noPexExtension) PexExtensionInit();
|
||||
#endif
|
||||
#ifdef MULTIBUFFER
|
||||
if (!noMultibufferExtension) MultibufferExtensionInit();
|
||||
#endif
|
||||
|
|
@ -605,9 +565,6 @@ InitExtensions(argc, argv)
|
|||
XvMCExtensionInit();
|
||||
}
|
||||
#endif
|
||||
#ifdef XIE
|
||||
if (!noXie) XieInit();
|
||||
#endif
|
||||
#ifdef XSYNC
|
||||
if (!noSyncExtension) SyncExtensionInit();
|
||||
#endif
|
||||
|
|
@ -716,9 +673,6 @@ InitVisualWrap()
|
|||
#else /* XFree86LOADER */
|
||||
/* List of built-in (statically linked) extensions */
|
||||
static ExtensionModule staticExtensions[] = {
|
||||
#ifdef BEZIER
|
||||
{ BezierExtensionInit, "BEZIER", &noBezierExtension, NULL, NULL },
|
||||
#endif
|
||||
#ifdef XTESTEXT1
|
||||
{ XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL },
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -128,9 +128,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#endif
|
||||
|
||||
Bool noTestExtensions;
|
||||
#ifdef BEZIER
|
||||
Bool noBezierExtension = FALSE;
|
||||
#endif
|
||||
#ifdef BIGREQS
|
||||
Bool noBigReqExtension = FALSE;
|
||||
#endif
|
||||
|
|
@ -193,9 +190,6 @@ Bool noSyncExtension = FALSE;
|
|||
#ifdef TOGCUP
|
||||
Bool noXcupExtension = FALSE;
|
||||
#endif
|
||||
#ifdef PEXEXT
|
||||
Bool noPexExtension = FALSE;
|
||||
#endif
|
||||
#ifdef RES
|
||||
Bool noResExtension = FALSE;
|
||||
#endif
|
||||
|
|
@ -210,9 +204,6 @@ Bool noXCMiscExtension = FALSE;
|
|||
* interface is stable */
|
||||
Bool noXevieExtension = TRUE;
|
||||
#endif
|
||||
#ifdef XIE
|
||||
Bool noXie = FALSE;
|
||||
#endif
|
||||
#ifdef XF86BIGFONT
|
||||
Bool noXFree86BigfontExtension = FALSE;
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user