Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 146 insertions, 117 deletions

diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c
index 3076e7b28..462bcfff5 100644
--- a/xorg-server/mi/miinitext.c
+++ b/xorg-server/mi/miinitext.c
@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
@@ -94,7 +93,6 @@ SOFTWARE.
 #include "micmap.h"
 #include "globals.h"
 
-
 extern Bool noTestExtensions;
 
 #ifdef COMPOSITE
@@ -119,6 +117,7 @@ extern Bool noMITShmExtension;
 extern Bool noRRExtension;
 #endif
 extern Bool noRenderExtension;
+
 #ifdef XCSECURITY
 extern Bool noSecurityExtension;
 #endif
@@ -156,8 +155,8 @@ extern Bool noGEExtension;
 
 #ifndef XFree86LOADER
 #define INITARGS void
-typedef void (*InitExtension)(INITARGS);
-#else /* XFree86Loader */
+typedef void (*InitExtension) (INITARGS);
+#else                           /* XFree86Loader */
 #include "loaderProcs.h"
 #endif
 
@@ -196,12 +195,14 @@ extern void PanoramiXExtensionInit(INITARGS);
 extern void PseudoramiXExtensionInit(INITARGS);
 #endif
 extern void XInputExtensionInit(INITARGS);
+
 #ifdef XTEST
 extern void XTestExtensionInit(INITARGS);
 #endif
 extern void BigReqExtensionInit(INITARGS);
+
 #ifdef SCREENSAVER
-extern void ScreenSaverExtensionInit (INITARGS);
+extern void ScreenSaverExtensionInit(INITARGS);
 #endif
 #ifdef XV
 extern void XvExtensionInit(INITARGS);
@@ -210,6 +211,7 @@ extern void XvMCExtensionInit(INITARGS);
 extern void SyncExtensionInit(INITARGS);
 extern void XkbExtensionInit(INITARGS);
 extern void XCMiscExtensionInit(INITARGS);
+
 #ifdef XRECORD
 extern void RecordExtensionInit(INITARGS);
 #endif
@@ -234,7 +236,7 @@ extern void XFree86DGAExtensionInit(INITARGS);
 #ifdef GLXEXT
 typedef struct __GLXprovider __GLXprovider;
 extern __GLXprovider __glXDRISWRastProvider;
-extern void GlxPushProvider(__GLXprovider *impl);
+extern void GlxPushProvider(__GLXprovider * impl);
 extern void GlxExtensionInit(INITARGS);
 #endif
 #ifdef XF86DRI
@@ -244,6 +246,7 @@ extern void XFree86DRIExtensionInit(INITARGS);
 extern void DPMSExtensionInit(INITARGS);
 #endif
 extern void RenderExtensionInit(INITARGS);
+
 #ifdef RANDR
 extern void RRExtensionInit(INITARGS);
 #endif
@@ -272,253 +275,279 @@ typedef struct {
     Bool *disablePtr;
 } ExtensionToggle;
 
-static ExtensionToggle ExtensionToggleList[] =
-{
+static ExtensionToggle ExtensionToggleList[] = {
     /* sort order is extension name string as shown in xdpyinfo */
-    { "Generic Events", &noGEExtension },
+    {"Generic Events", &noGEExtension},
 #ifdef COMPOSITE
-    { "Composite", &noCompositeExtension },
+    {"Composite", &noCompositeExtension},
 #endif
 #ifdef DAMAGE
-    { "DAMAGE", &noDamageExtension },
+    {"DAMAGE", &noDamageExtension},
 #endif
 #ifdef DBE
-    { "DOUBLE-BUFFER", &noDbeExtension },
+    {"DOUBLE-BUFFER", &noDbeExtension},
 #endif
 #ifdef DPMSExtension
-    { "DPMS", &noDPMSExtension },
+    {"DPMS", &noDPMSExtension},
 #endif
 #ifdef GLXEXT
-    { "GLX", &noGlxExtension },
+    {"GLX", &noGlxExtension},
 #endif
 #ifdef SCREENSAVER
-    { "MIT-SCREEN-SAVER", &noScreenSaverExtension },
+    {"MIT-SCREEN-SAVER", &noScreenSaverExtension},
 #endif
 #ifdef MITSHM
-    { SHMNAME, &noMITShmExtension },
+    {SHMNAME, &noMITShmExtension},
 #endif
 #ifdef RANDR
-    { "RANDR", &noRRExtension },
+    {"RANDR", &noRRExtension},
 #endif
-    { "RENDER", &noRenderExtension },
+    {"RENDER", &noRenderExtension},
 #ifdef XCSECURITY
-    { "SECURITY", &noSecurityExtension },
+    {"SECURITY", &noSecurityExtension},
 #endif
 #ifdef RES
-    { "X-Resource", &noResExtension },
+    {"X-Resource", &noResExtension},
 #endif
 #ifdef XF86BIGFONT
-    { "XFree86-Bigfont", &noXFree86BigfontExtension },
+    {"XFree86-Bigfont", &noXFree86BigfontExtension},
 #endif
 #ifdef XFreeXDGA
-    { "XFree86-DGA", &noXFree86DGAExtension },
+    {"XFree86-DGA", &noXFree86DGAExtension},
 #endif
 #ifdef XF86DRI
-    { "XFree86-DRI", &noXFree86DRIExtension },
+    {"XFree86-DRI", &noXFree86DRIExtension},
 #endif
 #ifdef XF86VIDMODE
-    { "XFree86-VidModeExtension", &noXFree86VidModeExtension },
+    {"XFree86-VidModeExtension", &noXFree86VidModeExtension},
 #endif
 #ifdef XFIXES
-    { "XFIXES", &noXFixesExtension },
+    {"XFIXES", &noXFixesExtension},
 #endif
 #ifdef PANORAMIX
-    { "XINERAMA", &noPanoramiXExtension },
+    {"XINERAMA", &noPanoramiXExtension},
 #endif
-    { "XInputExtension", NULL },
-    { "XKEYBOARD", NULL },
+    {"XInputExtension", NULL},
+    {"XKEYBOARD", NULL},
 #ifdef XSELINUX
-    { "SELinux", &noSELinuxExtension },
+    {"SELinux", &noSELinuxExtension},
 #endif
-    { "XTEST", &noTestExtensions },
+    {"XTEST", &noTestExtensions},
 #ifdef XV
-    { "XVideo", &noXvExtension },
+    {"XVideo", &noXvExtension},
 #endif
-    { NULL, NULL }
+    {NULL, NULL}
 };
 
-Bool EnableDisableExtension(const char *name, Bool enable)
+Bool
+EnableDisableExtension(const char *name, Bool enable)
 {
     ExtensionToggle *ext = &ExtensionToggleList[0];
 
     for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) {
-	if (strcmp(name, ext->name) == 0) {
-	    if (ext->disablePtr != NULL) {
-		*ext->disablePtr = !enable;
-		return TRUE;
-	    } else {
-		/* Extension is always on, impossible to disable */
-		return enable; /* okay if they wanted to enable,
-				  fail if they tried to disable */
-	    }
-	}
+        if (strcmp(name, ext->name) == 0) {
+            if (ext->disablePtr != NULL) {
+                *ext->disablePtr = !enable;
+                return TRUE;
+            }
+            else {
+                /* Extension is always on, impossible to disable */
+                return enable;  /* okay if they wanted to enable,
+                                   fail if they tried to disable */
+            }
+        }
     }
 
     return FALSE;
 }
 
-void EnableDisableExtensionError(const char *name, Bool enable)
+void
+EnableDisableExtensionError(const char *name, Bool enable)
 {
     ExtensionToggle *ext = &ExtensionToggleList[0];
     Bool found = FALSE;
 
     for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) {
-	if ((strcmp(name, ext->name) == 0) && (ext->disablePtr == NULL)) {
-	    ErrorF("[mi] Extension \"%s\" can not be disabled\n", name);
-	    found = TRUE;
-	    break;
-	}
+        if ((strcmp(name, ext->name) == 0) && (ext->disablePtr == NULL)) {
+            ErrorF("[mi] Extension \"%s\" can not be disabled\n", name);
+            found = TRUE;
+            break;
+        }
     }
     if (found == FALSE)
-	ErrorF("[mi] Extension \"%s\" is not recognized\n", name);
+        ErrorF("[mi] Extension \"%s\" is not recognized\n", name);
     ErrorF("[mi] Only the following extensions can be run-time %s:\n",
-	   enable ? "enabled" : "disabled");
+           enable ? "enabled" : "disabled");
     for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) {
-	if (ext->disablePtr != NULL) {
-	    ErrorF("[mi]    %s\n", ext->name);
-	}
+        if (ext->disablePtr != NULL) {
+            ErrorF("[mi]    %s\n", ext->name);
+        }
     }
 }
 
 #ifndef XFree86LOADER
 
-/*ARGSUSED*/
-void
+ /*ARGSUSED*/ void
 InitExtensions(int argc, char *argv[])
 {
-    if (!noGEExtension) GEExtensionInit();
+    if (!noGEExtension)
+        GEExtensionInit();
 
 #ifdef PANORAMIX
-  if (!noPanoramiXExtension) PanoramiXExtensionInit();
+    if (!noPanoramiXExtension)
+        PanoramiXExtensionInit();
 #endif
 #ifdef INXQUARTZ
-    if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
+    if (!noPseudoramiXExtension)
+        PseudoramiXExtensionInit();
 #endif
     ShapeExtensionInit();
 #ifdef MITSHM
-    if (!noMITShmExtension) ShmExtensionInit();
+    if (!noMITShmExtension)
+        ShmExtensionInit();
 #endif
     XInputExtensionInit();
 #ifdef XTEST
-    if (!noTestExtensions) XTestExtensionInit();
+    if (!noTestExtensions)
+        XTestExtensionInit();
 #endif
     BigReqExtensionInit();
 #if defined(SCREENSAVER)
-    if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
+    if (!noScreenSaverExtension)
+        ScreenSaverExtensionInit();
 #endif
 #ifdef XV
     if (!noXvExtension) {
-      XvExtensionInit();
-      XvMCExtensionInit();
+        XvExtensionInit();
+        XvMCExtensionInit();
     }
 #endif
     SyncExtensionInit();
     XkbExtensionInit();
     XCMiscExtensionInit();
 #ifdef XRECORD
-    if (!noTestExtensions) RecordExtensionInit(); 
+    if (!noTestExtensions)
+        RecordExtensionInit();
 #endif
 #ifdef DBE
-    if (!noDbeExtension) DbeExtensionInit();
+    if (!noDbeExtension)
+        DbeExtensionInit();
 #endif
 #ifdef XCSECURITY
-    if (!noSecurityExtension) SecurityExtensionInit();
+    if (!noSecurityExtension)
+        SecurityExtensionInit();
 #endif
 #ifdef XSELINUX
-    if (!noSELinuxExtension) SELinuxExtensionInit();
+    if (!noSELinuxExtension)
+        SELinuxExtensionInit();
 #endif
 #if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
-    if (!noDPMSExtension) DPMSExtensionInit();
+    if (!noDPMSExtension)
+        DPMSExtensionInit();
 #endif
 #ifdef XF86BIGFONT
-    if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
+    if (!noXFree86BigfontExtension)
+        XFree86BigfontExtensionInit();
 #endif
 #if !defined(NO_HW_ONLY_EXTS)
 #if defined(XF86VIDMODE)
-    if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
+    if (!noXFree86VidModeExtension)
+        XFree86VidModeExtensionInit();
 #endif
 #if defined(XFreeXDGA)
-    if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
+    if (!noXFree86DGAExtension)
+        XFree86DGAExtensionInit();
 #endif
 #ifdef XF86DRI
-    if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
+    if (!noXFree86DRIExtension)
+        XFree86DRIExtensionInit();
 #endif
 #endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
-    if (!noXFixesExtension) XFixesExtensionInit();
+    if (!noXFixesExtension)
+        XFixesExtensionInit();
 #endif
-    if (!noRenderExtension) RenderExtensionInit();
+    if (!noRenderExtension)
+        RenderExtensionInit();
 #ifdef RANDR
-    if (!noRRExtension) RRExtensionInit();
+    if (!noRRExtension)
+        RRExtensionInit();
 #endif
 #ifdef RES
-    if (!noResExtension) ResExtensionInit();
+    if (!noResExtension)
+        ResExtensionInit();
 #endif
 #ifdef DMXEXT
-    DMXExtensionInit(); /* server-specific extension, cannot be disabled */
+    DMXExtensionInit();         /* server-specific extension, cannot be disabled */
 #endif
 #ifdef COMPOSITE
-    if (!noCompositeExtension) CompositeExtensionInit();
+    if (!noCompositeExtension)
+        CompositeExtensionInit();
 #endif
 #ifdef DAMAGE
-    if (!noDamageExtension) DamageExtensionInit();
+    if (!noDamageExtension)
+        DamageExtensionInit();
 #endif
 
 #ifdef GLXEXT
     if (serverGeneration == 1)
     {
-	GlxPushProvider(&__glXDRISWRastProvider);
-	glxWinPushNativeProvider();
+        GlxPushProvider(&__glXDRISWRastProvider);
+        glxWinPushNativeProvider();
     }
-    if (!noGlxExtension) GlxExtensionInit();
+    if (!noGlxExtension)
+        GlxExtensionInit();
+
 #endif
 }
 
-#else /* XFree86LOADER */
+#else                           /* XFree86LOADER */
 /* List of built-in (statically linked) extensions */
 static ExtensionModule staticExtensions[] = {
-    { GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL, NULL},
-    { ShapeExtensionInit, "SHAPE", NULL, NULL, NULL },
+    {GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL, NULL},
+    {ShapeExtensionInit, "SHAPE", NULL, NULL, NULL},
 #ifdef MITSHM
-    { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
+    {ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL},
 #endif
-    { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL },
+    {XInputExtensionInit, "XInputExtension", NULL, NULL, NULL},
 #ifdef XTEST
-    { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
+    {XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL},
 #endif
-    { BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL, NULL },
-    { SyncExtensionInit, "SYNC", NULL, NULL, NULL },
-    { XkbExtensionInit, XkbName, NULL, NULL, NULL },
-    { XCMiscExtensionInit, "XC-MISC", NULL, NULL, NULL },
+    {BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL, NULL},
+    {SyncExtensionInit, "SYNC", NULL, NULL, NULL},
+    {XkbExtensionInit, XkbName, NULL, NULL, NULL},
+    {XCMiscExtensionInit, "XC-MISC", NULL, NULL, NULL},
 #ifdef XCSECURITY
-    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
+    {SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL,
+     NULL},
 #endif
 #ifdef PANORAMIX
-    { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
+    {PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension,
+     NULL, NULL},
 #endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
-    { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
+    {XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL},
 #endif
 #ifdef XF86BIGFONT
-    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
+    {XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension,
+     NULL, NULL},
 #endif
-    { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
+    {RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL},
 #ifdef RANDR
-    { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
+    {RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL},
 #endif
 #ifdef COMPOSITE
-    { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
+    {CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL},
 #endif
 #ifdef DAMAGE
-    { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
+    {DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL},
 #endif
-    { NULL, NULL, NULL, NULL, NULL }
+    {NULL, NULL, NULL, NULL, NULL}
 };
-    
-/*ARGSUSED*/
-void
+
+ /*ARGSUSED*/ void
 InitExtensions(int argc, char *argv[])
 {
     int i;
@@ -526,22 +555,22 @@ InitExtensions(int argc, char *argv[])
     static Bool listInitialised = FALSE;
 
     if (!listInitialised) {
-	/* Add built-in extensions to the list. */
-	for (i = 0; staticExtensions[i].name; i++)
-	    LoadExtension(&staticExtensions[i], TRUE);
+        /* Add built-in extensions to the list. */
+        for (i = 0; staticExtensions[i].name; i++)
+            LoadExtension(&staticExtensions[i], TRUE);
 
-	/* Sort the extensions according the init dependencies. */
-	LoaderSortExtensions();
-	listInitialised = TRUE;
+        /* Sort the extensions according the init dependencies. */
+        LoaderSortExtensions();
+        listInitialised = TRUE;
     }
 
     for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
-	ext = &ExtensionModuleList[i];
-	if (ext->initFunc != NULL && 
-	    (ext->disablePtr == NULL || !*ext->disablePtr)) {
-	    (ext->initFunc)();
-	}
+        ext = &ExtensionModuleList[i];
+        if (ext->initFunc != NULL &&
+            (ext->disablePtr == NULL || !*ext->disablePtr)) {
+            (ext->initFunc) ();
+        }
     }
 }
 
-#endif /* XFree86LOADER */
+#endif                          /* XFree86LOADER */