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, 160 insertions, 169 deletions

diff --git a/xorg-server/hw/xfree86/parser/Module.c b/xorg-server/hw/xfree86/parser/Module.c
index 3c4cefc18..1c458ae6c 100644
--- a/xorg-server/hw/xfree86/parser/Module.c
+++ b/xorg-server/hw/xfree86/parser/Module.c
@@ -52,7 +52,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /* View/edit this file with tab stops set to 4 */
 
 #ifdef HAVE_XORG_CONFIG_H
@@ -65,215 +64,207 @@
 
 extern LexRec val;
 
-static xf86ConfigSymTabRec SubModuleTab[] =
-{
-	{ENDSUBSECTION, "endsubsection"},
-	{OPTION, "option"},
-	{-1, ""},
+static xf86ConfigSymTabRec SubModuleTab[] = {
+    {ENDSUBSECTION, "endsubsection"},
+    {OPTION, "option"},
+    {-1, ""},
 };
 
-static xf86ConfigSymTabRec ModuleTab[] =
-{
-	{ENDSECTION, "endsection"},
-	{LOAD, "load"},
-    {DISABLE, "disable"}, 
-	{LOAD_DRIVER, "loaddriver"},
-	{SUBSECTION, "subsection"},
-	{-1, ""},
+static xf86ConfigSymTabRec ModuleTab[] = {
+    {ENDSECTION, "endsection"},
+    {LOAD, "load"},
+    {DISABLE, "disable"},
+    {LOAD_DRIVER, "loaddriver"},
+    {SUBSECTION, "subsection"},
+    {-1, ""},
 };
 
 #define CLEANUP xf86freeModules
 
 static XF86LoadPtr
-xf86parseModuleSubSection (XF86LoadPtr head, char *name)
+xf86parseModuleSubSection(XF86LoadPtr head, char *name)
 {
-	int token;
-	parsePrologue (XF86LoadPtr, XF86LoadRec)
+    int token;
 
-	ptr->load_name = name;
-	ptr->load_type = XF86_LOAD_MODULE;
-        ptr->ignore    = 0;
-	ptr->load_opt  = NULL;
-	ptr->list.next = NULL;
+    parsePrologue(XF86LoadPtr, XF86LoadRec)
 
-	while ((token = xf86getToken (SubModuleTab)) != ENDSUBSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->load_comment = xf86addComment(ptr->load_comment, val.str);
-			break;
-		case OPTION:
-			ptr->load_opt = xf86parseOption(ptr->load_opt);
-			break;
-		case EOF_TOKEN:
-			xf86parseError (UNEXPECTED_EOF_MSG);
-			free(ptr);
-			return NULL;
-		default:
-			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
-			free(ptr);
-			return NULL;
-			break;
-		}
+        ptr->load_name = name;
+    ptr->load_type = XF86_LOAD_MODULE;
+    ptr->ignore = 0;
+    ptr->load_opt = NULL;
+    ptr->list.next = NULL;
 
-	}
+    while ((token = xf86getToken(SubModuleTab)) != ENDSUBSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->load_comment = xf86addComment(ptr->load_comment, val.str);
+            break;
+        case OPTION:
+            ptr->load_opt = xf86parseOption(ptr->load_opt);
+            break;
+        case EOF_TOKEN:
+            xf86parseError(UNEXPECTED_EOF_MSG);
+            free(ptr);
+            return NULL;
+        default:
+            xf86parseError(INVALID_KEYWORD_MSG, xf86tokenString());
+            free(ptr);
+            return NULL;
+            break;
+        }
 
-	return ((XF86LoadPtr) xf86addListItem ((glp) head, (glp) ptr));
+    }
+
+    return ((XF86LoadPtr) xf86addListItem((glp) head, (glp) ptr));
 }
 
 XF86ConfModulePtr
-xf86parseModuleSection (void)
+xf86parseModuleSection(void)
 {
-	int token;
-	parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)
+    int token;
+
+    parsePrologue(XF86ConfModulePtr, XF86ConfModuleRec)
 
-	while ((token = xf86getToken (ModuleTab)) != ENDSECTION)
-	{
-		switch (token)
-		{
-		case COMMENT:
-			ptr->mod_comment = xf86addComment(ptr->mod_comment, val.str);
-			break;
-		case LOAD:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-				Error (QUOTE_MSG, "Load");
-			ptr->mod_load_lst =
-				xf86addNewLoadDirective (ptr->mod_load_lst, val.str,
-									 XF86_LOAD_MODULE, NULL);
-			break;
-		case DISABLE:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-				Error (QUOTE_MSG, "Disable");
-			ptr->mod_disable_lst =
-				xf86addNewLoadDirective (ptr->mod_disable_lst, val.str,
-									 XF86_DISABLE_MODULE, NULL);
-			break;
-		case LOAD_DRIVER:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-				Error (QUOTE_MSG, "LoadDriver");
-			ptr->mod_load_lst =
-				xf86addNewLoadDirective (ptr->mod_load_lst, val.str,
-									 XF86_LOAD_DRIVER, NULL);
-			break;
-		case SUBSECTION:
-			if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
-						Error (QUOTE_MSG, "SubSection");
-			ptr->mod_load_lst =
-				xf86parseModuleSubSection (ptr->mod_load_lst, val.str);
-			break;
-		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG);
-			break;
-		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-			break;
-		}
-	}
+        while ((token = xf86getToken(ModuleTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->mod_comment = xf86addComment(ptr->mod_comment, val.str);
+            break;
+        case LOAD:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "Load");
+            ptr->mod_load_lst =
+                xf86addNewLoadDirective(ptr->mod_load_lst, val.str,
+                                        XF86_LOAD_MODULE, NULL);
+            break;
+        case DISABLE:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "Disable");
+            ptr->mod_disable_lst =
+                xf86addNewLoadDirective(ptr->mod_disable_lst, val.str,
+                                        XF86_DISABLE_MODULE, NULL);
+            break;
+        case LOAD_DRIVER:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "LoadDriver");
+            ptr->mod_load_lst =
+                xf86addNewLoadDirective(ptr->mod_load_lst, val.str,
+                                        XF86_LOAD_DRIVER, NULL);
+            break;
+        case SUBSECTION:
+            if (xf86getSubToken(&(ptr->mod_comment)) != STRING)
+                Error(QUOTE_MSG, "SubSection");
+            ptr->mod_load_lst =
+                xf86parseModuleSubSection(ptr->mod_load_lst, val.str);
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString());
+            break;
+        }
+    }
 
 #ifdef DEBUG
-	printf ("Module section parsed\n");
+    printf("Module section parsed\n");
 #endif
 
-	return ptr;
+    return ptr;
 }
 
 #undef CLEANUP
 
 void
-xf86printModuleSection (FILE * cf, XF86ConfModulePtr ptr)
+xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr)
 {
-	XF86LoadPtr lptr;
+    XF86LoadPtr lptr;
 
-	if (ptr == NULL)
-		return;
+    if (ptr == NULL)
+        return;
 
-	if (ptr->mod_comment)
-		fprintf(cf, "%s", ptr->mod_comment);
-	for (lptr = ptr->mod_load_lst; lptr; lptr = lptr->list.next)
-	{
-		switch (lptr->load_type)
-		{
-		case XF86_LOAD_MODULE:
-			if( lptr->load_opt == NULL ) {
-				fprintf (cf, "\tLoad  \"%s\"", lptr->load_name);
-				if (lptr->load_comment)
-					fprintf(cf, "%s", lptr->load_comment);
-				else
-					fputc('\n', cf);
-			}
-			else
-			{
-				fprintf (cf, "\tSubSection \"%s\"\n", lptr->load_name);
-				if (lptr->load_comment)
-					fprintf(cf, "%s", lptr->load_comment);
-				xf86printOptionList(cf, lptr->load_opt, 2);
-				fprintf (cf, "\tEndSubSection\n");
-			}
-			break;
-		case XF86_LOAD_DRIVER:
-			fprintf (cf, "\tLoadDriver  \"%s\"", lptr->load_name);
-				if (lptr->load_comment)
-					fprintf(cf, "%s", lptr->load_comment);
-				else
-					fputc('\n', cf);
-			break;
+    if (ptr->mod_comment)
+        fprintf(cf, "%s", ptr->mod_comment);
+    for (lptr = ptr->mod_load_lst; lptr; lptr = lptr->list.next) {
+        switch (lptr->load_type) {
+        case XF86_LOAD_MODULE:
+            if (lptr->load_opt == NULL) {
+                fprintf(cf, "\tLoad  \"%s\"", lptr->load_name);
+                if (lptr->load_comment)
+                    fprintf(cf, "%s", lptr->load_comment);
+                else
+                    fputc('\n', cf);
+            }
+            else {
+                fprintf(cf, "\tSubSection \"%s\"\n", lptr->load_name);
+                if (lptr->load_comment)
+                    fprintf(cf, "%s", lptr->load_comment);
+                xf86printOptionList(cf, lptr->load_opt, 2);
+                fprintf(cf, "\tEndSubSection\n");
+            }
+            break;
+        case XF86_LOAD_DRIVER:
+            fprintf(cf, "\tLoadDriver  \"%s\"", lptr->load_name);
+            if (lptr->load_comment)
+                fprintf(cf, "%s", lptr->load_comment);
+            else
+                fputc('\n', cf);
+            break;
 #if 0
-		default:
-			fprintf (cf, "#\tUnknown type  \"%s\"\n", lptr->load_name);
-			break;
+        default:
+            fprintf(cf, "#\tUnknown type  \"%s\"\n", lptr->load_name);
+            break;
 #endif
-		}
-	}
+        }
+    }
 }
 
 XF86LoadPtr
-xf86addNewLoadDirective (XF86LoadPtr head, char *name, int type, XF86OptionPtr opts)
+xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type,
+                        XF86OptionPtr opts)
 {
-	XF86LoadPtr new;
-	int token;
+    XF86LoadPtr new;
+    int token;
 
-	new = calloc (1, sizeof (XF86LoadRec));
-	new->load_name = name;
-	new->load_type = type;
-	new->load_opt  = opts;
-        new->ignore    = 0;
-	new->list.next = NULL;
+    new = calloc(1, sizeof(XF86LoadRec));
+    new->load_name = name;
+    new->load_type = type;
+    new->load_opt = opts;
+    new->ignore = 0;
+    new->list.next = NULL;
 
-	if ((token = xf86getToken(NULL)) == COMMENT)
-		new->load_comment = xf86addComment(new->load_comment, val.str);
-	else
-		xf86unGetToken(token);
+    if ((token = xf86getToken(NULL)) == COMMENT)
+        new->load_comment = xf86addComment(new->load_comment, val.str);
+    else
+        xf86unGetToken(token);
 
-	return ((XF86LoadPtr) xf86addListItem ((glp) head, (glp) new));
+    return ((XF86LoadPtr) xf86addListItem((glp) head, (glp) new));
 }
 
 void
-xf86freeModules (XF86ConfModulePtr ptr)
+xf86freeModules(XF86ConfModulePtr ptr)
 {
-	XF86LoadPtr lptr;
-	XF86LoadPtr prev;
+    XF86LoadPtr lptr;
+    XF86LoadPtr prev;
 
-	if (ptr == NULL)
-		return;
-	lptr = ptr->mod_load_lst;
-	while (lptr)
-	{
-		TestFree (lptr->load_name);
-		TestFree (lptr->load_comment);
-		prev = lptr;
-		lptr = lptr->list.next;
-		free (prev);
-	}
-	lptr = ptr->mod_disable_lst;
-	while (lptr)
-	{
-		TestFree (lptr->load_name);
-		TestFree (lptr->load_comment);
-		prev = lptr;
-		lptr = lptr->list.next;
-		free (prev);
-	}
-	TestFree (ptr->mod_comment);
-	free (ptr);
+    if (ptr == NULL)
+        return;
+    lptr = ptr->mod_load_lst;
+    while (lptr) {
+        TestFree(lptr->load_name);
+        TestFree(lptr->load_comment);
+        prev = lptr;
+        lptr = lptr->list.next;
+        free(prev);
+    }
+    lptr = ptr->mod_disable_lst;
+    while (lptr) {
+        TestFree(lptr->load_name);
+        TestFree(lptr->load_comment);
+        prev = lptr;
+        lptr = lptr->list.next;
+        free(prev);
+    }
+    TestFree(ptr->mod_comment);
+    free(ptr);
 }