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, 70 insertions, 59 deletions

diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c
index 6187415f5..e1e666317 100644
--- a/xorg-server/glx/indirect_texture_compression.c
+++ b/xorg-server/glx/indirect_texture_compression.c
@@ -44,80 +44,91 @@
 #include "glthread.h"
 #include "dispatch.h"
 
-int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *pc)
+int
+__glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext * const cx = __glXForceCurrent( cl, req->contextTag, & error );
+    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
     ClientPtr client = cl->client;
 
-
     pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-	const GLenum target = *(GLenum *)(pc + 0);
-	const GLint  level  = *(GLint  *)(pc + 4);
-	GLint compsize = 0;
-	char *answer = NULL, answerBuffer[200];
-
-	CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
-
-	if ( compsize != 0 ) {
-	    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-	    __glXClearErrorOccured();
-	    CALL_GetCompressedTexImageARB(GET_DISPATCH(), (target, level, answer));
-	}
-
-	if (__glXErrorOccured()) {
-	    __GLX_BEGIN_REPLY(0);
-	    __GLX_SEND_HEADER();
-	} else {
-	    __GLX_BEGIN_REPLY(compsize);
-	    ((xGLXGetTexImageReply *)&__glXReply)->width = compsize;
-	    __GLX_SEND_HEADER();
-	    __GLX_SEND_VOID_ARRAY(compsize);
-	}
-
-	error = Success;
+    if (cx != NULL) {
+        const GLenum target = *(GLenum *) (pc + 0);
+        const GLint level = *(GLint *) (pc + 4);
+        GLint compsize = 0;
+        char *answer = NULL, answerBuffer[200];
+
+        CALL_GetTexLevelParameteriv(GET_DISPATCH(),
+                                    (target, level,
+                                     GL_TEXTURE_COMPRESSED_IMAGE_SIZE,
+                                     &compsize));
+
+        if (compsize != 0) {
+            __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
+            __glXClearErrorOccured();
+            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
+                                          (target, level, answer));
+        }
+
+        if (__glXErrorOccured()) {
+            __GLX_BEGIN_REPLY(0);
+            __GLX_SEND_HEADER();
+        }
+        else {
+            __GLX_BEGIN_REPLY(compsize);
+            ((xGLXGetTexImageReply *) & __glXReply)->width = compsize;
+            __GLX_SEND_HEADER();
+            __GLX_SEND_VOID_ARRAY(compsize);
+        }
+
+        error = Success;
     }
 
     return error;
 }
 
-
-int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *pc)
+int
+__glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl,
+                                       GLbyte * pc)
 {
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext * const cx = __glXForceCurrent( cl, bswap_32( req->contextTag ), & error );
+    __GLXcontext *const cx =
+        __glXForceCurrent(cl, bswap_32(req->contextTag), &error);
     ClientPtr client = cl->client;
 
-
     pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-	const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) );
-	const GLint  level =  (GLint ) bswap_32( *(int *)(pc + 4) );
-	GLint compsize = 0;
-	char *answer = NULL, answerBuffer[200];
-
-	CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
-
-	if ( compsize != 0 ) {
-	    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
-	    __glXClearErrorOccured();
-	    CALL_GetCompressedTexImageARB(GET_DISPATCH(), (target, level, answer));
-	}
-
-	if (__glXErrorOccured()) {
-	    __GLX_BEGIN_REPLY(0);
-	    __GLX_SEND_HEADER();
-	} else {
-	    __GLX_BEGIN_REPLY(compsize);
-	    ((xGLXGetTexImageReply *)&__glXReply)->width = compsize;
-	    __GLX_SEND_HEADER();
-	    __GLX_SEND_VOID_ARRAY(compsize);
-	}
-	
-	error = Success;
+    if (cx != NULL) {
+        const GLenum target = (GLenum) bswap_32(*(int *) (pc + 0));
+        const GLint level = (GLint) bswap_32(*(int *) (pc + 4));
+        GLint compsize = 0;
+        char *answer = NULL, answerBuffer[200];
+
+        CALL_GetTexLevelParameteriv(GET_DISPATCH(),
+                                    (target, level,
+                                     GL_TEXTURE_COMPRESSED_IMAGE_SIZE,
+                                     &compsize));
+
+        if (compsize != 0) {
+            __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
+            __glXClearErrorOccured();
+            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
+                                          (target, level, answer));
+        }
+
+        if (__glXErrorOccured()) {
+            __GLX_BEGIN_REPLY(0);
+            __GLX_SEND_HEADER();
+        }
+        else {
+            __GLX_BEGIN_REPLY(compsize);
+            ((xGLXGetTexImageReply *) & __glXReply)->width = compsize;
+            __GLX_SEND_HEADER();
+            __GLX_SEND_VOID_ARRAY(compsize);
+        }
+
+        error = Success;
     }
 
     return error;