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, 177 insertions, 184 deletions

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
index 632454f37..ca15ee0e7 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
@@ -1,184 +1,177 @@
-/*

- * Copyright (c) 1997 Matthieu Herrb

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Matthieu Herrb not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Matthieu Herrb makes no

- * representations about the suitability of this software for any purpose.

- *  It is provided "as is" without express or implied warranty.

- *

- * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Module.h"

-#include "xf86Opt.h"

-

-#include <X11/Xproto.h>

-

-#include "modinit.h"

-#include "globals.h"

-

-static MODULESETUPPROTO(extmodSetup);

-

-/*

- * Array describing extensions to be initialized

- */

-static ExtensionModule extensionModules[] = {

-#ifdef XSELINUX

-    {

-	SELinuxExtensionInit,

-	SELINUX_EXTENSION_NAME,

-	&noSELinuxExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef SCREENSAVER

-    {

-	ScreenSaverExtensionInit,

-	ScreenSaverName,

-	&noScreenSaverExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef XF86VIDMODE

-    {

-	XFree86VidModeExtensionInit,

-	XF86VIDMODENAME,

-	&noXFree86VidModeExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef XFreeXDGA

-    {

-	XFree86DGAExtensionInit,

-	XF86DGANAME,

-	&noXFree86DGAExtension,

-	XFree86DGARegister,

-	NULL

-    },

-#endif

-#ifdef DPMSExtension

-    {

-	DPMSExtensionInit,

-	DPMSExtensionName,

-	&noDPMSExtension,

-	NULL,

-	NULL

-    },

-#endif

-#ifdef XV

-    {

-	XvExtensionInit,

-	XvName,

-	&noXvExtension,

-	XvRegister,

-	NULL

-    },

-    {

-        XvMCExtensionInit,

-        XvMCName,

-        &noXvExtension,

-        NULL,

-        NULL

-    },

-#endif

-#ifdef RES

-    {

-        ResExtensionInit,

-        XRES_NAME, 

-        &noResExtension,

-        NULL,

-        NULL

-    },

-#endif

-    {				/* DON'T delete this entry ! */

-	NULL,

-	NULL,

-	NULL,

-	NULL,

-	NULL

-    }

-};

-

-static XF86ModuleVersionInfo VersRec =

-{

-	"extmod",

-	MODULEVENDORSTRING,

-	MODINFOSTRING1,

-	MODINFOSTRING2,

-	XORG_VERSION_CURRENT,

-	1, 0, 0,

-	ABI_CLASS_EXTENSION,

-	ABI_EXTENSION_VERSION,

-	MOD_CLASS_EXTENSION,

-	{0,0,0,0}

-};

-

-/*

- * Data for the loader

- */

-_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };

-

-static pointer

-extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)

-{

-    int i;

-

-    /* XXX the option stuff here is largely a sample/test case */

-

-    for (i = 0; extensionModules[i].name != NULL; i++) {

-	if (opts) {

-	    char *s;

-	    if (asprintf(&s, "omit%s", extensionModules[i].name) != -1) {

-		pointer o;

-		o = xf86FindOption(opts, s);

-		free(s);

-		if (o) {

-		    xf86MarkOptionUsed(o);

-		    continue;

-		}

-	    }

-	}

-

-#ifdef XSELINUX

-	if (! strcmp(SELINUX_EXTENSION_NAME, extensionModules[i].name)) {

-	    pointer o;

-	    selinuxEnforcingState = SELINUX_MODE_DEFAULT;

-

-	    if ((o = xf86FindOption(opts, "SELinux mode disabled"))) {

-		xf86MarkOptionUsed(o);

-		selinuxEnforcingState = SELINUX_MODE_DISABLED;

-	    }

-	    if ((o = xf86FindOption(opts, "SELinux mode permissive"))) {

-		xf86MarkOptionUsed(o);

-		selinuxEnforcingState = SELINUX_MODE_PERMISSIVE;

-	    }

-	    if ((o = xf86FindOption(opts, "SELinux mode enforcing"))) {

-		xf86MarkOptionUsed(o);

-		selinuxEnforcingState = SELINUX_MODE_ENFORCING;

-	    }

-	}

-#endif

-

-	LoadExtension(&extensionModules[i], FALSE);

-    }

-    /* Need a non-NULL return */

-    return (pointer)1;

-}

+/*
+ * Copyright (c) 1997 Matthieu Herrb
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Matthieu Herrb not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Matthieu Herrb makes no
+ * representations about the suitability of this software for any purpose.
+ *  It is provided "as is" without express or implied warranty.
+ *
+ * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+#include "xf86Opt.h"
+
+#include <X11/Xproto.h>
+
+#include "modinit.h"
+#include "globals.h"
+
+static MODULESETUPPROTO(extmodSetup);
+
+/*
+ * Array describing extensions to be initialized
+ */
+static ExtensionModule extensionModules[] = {
+#ifdef XSELINUX
+    {
+     SELinuxExtensionInit,
+     SELINUX_EXTENSION_NAME,
+     &noSELinuxExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef SCREENSAVER
+    {
+     ScreenSaverExtensionInit,
+     ScreenSaverName,
+     &noScreenSaverExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef XF86VIDMODE
+    {
+     XFree86VidModeExtensionInit,
+     XF86VIDMODENAME,
+     &noXFree86VidModeExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef XFreeXDGA
+    {
+     XFree86DGAExtensionInit,
+     XF86DGANAME,
+     &noXFree86DGAExtension,
+     XFree86DGARegister,
+     NULL},
+#endif
+#ifdef DPMSExtension
+    {
+     DPMSExtensionInit,
+     DPMSExtensionName,
+     &noDPMSExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef XV
+    {
+     XvExtensionInit,
+     XvName,
+     &noXvExtension,
+     XvRegister,
+     NULL},
+    {
+     XvMCExtensionInit,
+     XvMCName,
+     &noXvExtension,
+     NULL,
+     NULL},
+#endif
+#ifdef RES
+    {
+     ResExtensionInit,
+     XRES_NAME,
+     &noResExtension,
+     NULL,
+     NULL},
+#endif
+    {                           /* DON'T delete this entry ! */
+     NULL,
+     NULL,
+     NULL,
+     NULL,
+     NULL}
+};
+
+static XF86ModuleVersionInfo VersRec = {
+    "extmod",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_EXTENSION,
+    ABI_EXTENSION_VERSION,
+    MOD_CLASS_EXTENSION,
+    {0, 0, 0, 0}
+};
+
+/*
+ * Data for the loader
+ */
+_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
+
+static pointer
+extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    int i;
+
+    /* XXX the option stuff here is largely a sample/test case */
+
+    for (i = 0; extensionModules[i].name != NULL; i++) {
+        if (opts) {
+            char *s;
+
+            if (asprintf(&s, "omit%s", extensionModules[i].name) != -1) {
+                pointer o;
+
+                o = xf86FindOption(opts, s);
+                free(s);
+                if (o) {
+                    xf86MarkOptionUsed(o);
+                    continue;
+                }
+            }
+        }
+
+#ifdef XSELINUX
+        if (!strcmp(SELINUX_EXTENSION_NAME, extensionModules[i].name)) {
+            pointer o;
+
+            selinuxEnforcingState = SELINUX_MODE_DEFAULT;
+
+            if ((o = xf86FindOption(opts, "SELinux mode disabled"))) {
+                xf86MarkOptionUsed(o);
+                selinuxEnforcingState = SELINUX_MODE_DISABLED;
+            }
+            if ((o = xf86FindOption(opts, "SELinux mode permissive"))) {
+                xf86MarkOptionUsed(o);
+                selinuxEnforcingState = SELINUX_MODE_PERMISSIVE;
+            }
+            if ((o = xf86FindOption(opts, "SELinux mode enforcing"))) {
+                xf86MarkOptionUsed(o);
+                selinuxEnforcingState = SELINUX_MODE_ENFORCING;
+            }
+        }
+#endif
+
+        LoadExtension(&extensionModules[i], FALSE);
+    }
+    /* Need a non-NULL return */
+    return (pointer) 1;
+}