diff options
Diffstat (limited to 'mi/miinitext.c')
| -rw-r--r-- | mi/miinitext.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 45a14aff1..402410092 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -206,6 +206,9 @@ extern Bool noXkbExtension; #ifdef PANORAMIX extern Bool noPanoramiXExtension; #endif +#ifdef INXQUARTZ +extern Bool noPseudoramiXExtension; +#endif #ifdef XINPUT extern Bool noXInputExtension; #endif @@ -249,6 +252,9 @@ typedef void (*InitExtension)(INITARGS); #include "securitysrv.h" #include <X11/extensions/securstr.h> #endif +#ifdef XSELINUX +#include "xselinux.h" +#endif #ifdef PANORAMIX #include <X11/extensions/panoramiXproto.h> #endif @@ -272,6 +278,9 @@ extern void MultibufferExtensionInit(INITARGS); #ifdef PANORAMIX extern void PanoramiXExtensionInit(INITARGS); #endif +#ifdef INXQUARTZ +extern void PseudoramiXExtensionInit(INITARGS); +#endif #ifdef XINPUT extern void XInputExtensionInit(INITARGS); #endif @@ -319,9 +328,11 @@ extern void XagExtensionInit(INITARGS); extern void XaceExtensionInit(INITARGS); #endif #ifdef XCSECURITY -extern void SecurityExtensionSetup(INITARGS); extern void SecurityExtensionInit(INITARGS); #endif +#ifdef XSELINUX +extern void XSELinuxExtensionInit(INITARGS); +#endif #ifdef XPRINT extern void XpExtensionInit(INITARGS); #endif @@ -339,17 +350,10 @@ extern void XFree86DGAExtensionInit(INITARGS); #endif #ifdef GLXEXT typedef struct __GLXprovider __GLXprovider; -#ifdef INXDARWINAPP -extern __GLXprovider* __DarwinglXMesaProvider; -extern void DarwinGlxPushProvider(__GLXprovider *impl); -extern void DarwinGlxExtensionInit(INITARGS); -extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *); -#else extern __GLXprovider __glXMesaProvider; extern void GlxPushProvider(__GLXprovider *impl); extern void GlxExtensionInit(INITARGS); -#endif // INXDARWINAPP -#endif // GLXEXT +#endif #ifdef XF86DRI extern void XFree86DRIExtensionInit(INITARGS); #endif @@ -535,14 +539,14 @@ InitExtensions(argc, argv) { if (!noGEExtension) GEExtensionInit(); -#ifdef XCSECURITY - SecurityExtensionSetup(); -#endif #ifdef PANORAMIX # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX) if (!noPanoramiXExtension) PanoramiXExtensionInit(); # endif #endif +#ifdef INXQUARTZ + if(!noPseudoramiXExtension) PseudoramiXExtensionInit(); +#endif #ifdef SHAPE if (!noShapeExtension) ShapeExtensionInit(); #endif @@ -606,6 +610,9 @@ InitExtensions(argc, argv) #ifdef XCSECURITY if (!noSecurityExtension) SecurityExtensionInit(); #endif +#ifdef XSELINUX + XSELinuxExtensionInit(); +#endif #ifdef XPRINT XpExtensionInit(); /* server-specific extension, cannot be disabled */ #endif @@ -662,25 +669,15 @@ InitExtensions(argc, argv) #endif #ifdef GLXEXT -#ifdef INXDARWINAPP - DarwinGlxPushProvider(__DarwinglXMesaProvider); - if (!noGlxExtension) DarwinGlxExtensionInit(); -#else GlxPushProvider(&__glXMesaProvider); if (!noGlxExtension) GlxExtensionInit(); #endif -#endif } void InitVisualWrap() { miResetInitVisuals(); -#ifdef GLXEXT -#ifdef __DARWIN__ - DarwinGlxWrapInitVisuals(&miInitVisualsProc); -#endif -#endif } #else /* XFree86LOADER */ @@ -709,7 +706,10 @@ static ExtensionModule staticExtensions[] = { { XaceExtensionInit, XACE_EXTENSION_NAME, NULL, NULL, NULL }, #endif #ifdef XCSECURITY - { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL }, + { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL }, +#endif +#ifdef XSELINUX + { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, NULL, NULL }, #endif #ifdef XPRINT { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, |