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, 27 insertions, 26 deletions

diff --git a/xorg-server/test/fixes.c b/xorg-server/test/fixes.c
index 8c804ba26..7807c73ce 100644
--- a/xorg-server/test/fixes.c
+++ b/xorg-server/test/fixes.c
@@ -42,13 +42,12 @@ _fixes_test_direction(struct PointerBarrier *barrier, int d[4], int permitted)
     blocking = barrier_is_blocking_direction(barrier, dir);
     assert(blocking);
 
-    for (j = 0; j <= BarrierNegativeY; j++)
-    {
-        for (i = 0; i <= BarrierNegativeY; i++)
-        {
+    for (j = 0; j <= BarrierNegativeY; j++) {
+        for (i = 0; i <= BarrierNegativeY; i++) {
             barrier->directions |= 1 << i;
             blocking = barrier_is_blocking_direction(barrier, dir);
-            assert((barrier->directions & permitted) == permitted ? !blocking : blocking);
+            assert((barrier->directions & permitted) ==
+                   permitted ? !blocking : blocking);
         }
     }
 
@@ -63,14 +62,14 @@ fixes_pointer_barrier_direction_test(void)
     int y = 100;
 
     int directions[8][4] = {
-        { x, y, x, y + 100},            /* S  */
-        { x + 50, y, x - 50, y + 100},  /* SW */
-        { x + 100, y, x, y},            /* W  */
-        { x + 100, y + 50, x, y - 50},  /* NW */
-        { x, y + 100, x, y},            /* N  */
-        { x - 50, y + 100, x + 50, y},  /* NE */
-        { x, y, x + 100, y},            /* E  */
-        { x, y - 50, x + 100, y + 50},  /* SE */
+        {x, y, x, y + 100},     /* S  */
+        {x + 50, y, x - 50, y + 100},   /* SW */
+        {x + 100, y, x, y},     /* W  */
+        {x + 100, y + 50, x, y - 50},   /* NW */
+        {x, y + 100, x, y},     /* N  */
+        {x - 50, y + 100, x + 50, y},   /* NE */
+        {x, y, x + 100, y},     /* E  */
+        {x, y - 50, x + 100, y + 50},   /* SE */
     };
 
     barrier.x1 = x;
@@ -78,20 +77,21 @@ fixes_pointer_barrier_direction_test(void)
     barrier.y1 = y - 50;
     barrier.y2 = y + 49;
 
-
     _fixes_test_direction(&barrier, directions[0], BarrierPositiveY);
-    _fixes_test_direction(&barrier, directions[1], BarrierPositiveY | BarrierNegativeX);
+    _fixes_test_direction(&barrier, directions[1],
+                          BarrierPositiveY | BarrierNegativeX);
     _fixes_test_direction(&barrier, directions[2], BarrierNegativeX);
-    _fixes_test_direction(&barrier, directions[3], BarrierNegativeY | BarrierNegativeX);
+    _fixes_test_direction(&barrier, directions[3],
+                          BarrierNegativeY | BarrierNegativeX);
     _fixes_test_direction(&barrier, directions[4], BarrierNegativeY);
-    _fixes_test_direction(&barrier, directions[5], BarrierPositiveX | BarrierNegativeY);
+    _fixes_test_direction(&barrier, directions[5],
+                          BarrierPositiveX | BarrierNegativeY);
     _fixes_test_direction(&barrier, directions[6], BarrierPositiveX);
-    _fixes_test_direction(&barrier, directions[7], BarrierPositiveY | BarrierPositiveX);
-
+    _fixes_test_direction(&barrier, directions[7],
+                          BarrierPositiveY | BarrierPositiveX);
 
 }
 
-
 static void
 fixes_pointer_barriers_test(void)
 {
@@ -123,7 +123,7 @@ fixes_pointer_barriers_test(void)
 
     /* across, but outside of y range */
     x1 = x + 1;
-    x2 = x -1;
+    x2 = x - 1;
     y1 = y + 100;
     y2 = y + 100;
     assert(!barrier_is_blocking(&barrier, x1, y1, x2, y2, &distance));
@@ -184,7 +184,6 @@ fixes_pointer_barriers_test(void)
     y2 = y + 100;
     assert(!barrier_is_blocking(&barrier, x1, y1, x2, y2, &distance));
 
-
     /* horizontal barrier */
     barrier.x1 = x - 50;
     barrier.x2 = x + 50;
@@ -207,7 +206,7 @@ fixes_pointer_barriers_test(void)
     x1 = x + 100;
     x2 = x + 100;
     y1 = y + 1;
-    y2 = y -1;
+    y2 = y - 1;
     assert(!barrier_is_blocking(&barrier, x1, y1, x2, y2, &distance));
 
     /* across, diagonally */
@@ -268,14 +267,15 @@ fixes_pointer_barriers_test(void)
 
 }
 
-static void fixes_pointer_barrier_clamp_test(void)
+static void
+fixes_pointer_barrier_clamp_test(void)
 {
     struct PointerBarrier barrier;
 
     int x = 100;
     int y = 100;
 
-    int cx, cy; /* clamped */
+    int cx, cy;                 /* clamped */
 
     /* vert barrier */
     barrier.x1 = x;
@@ -316,7 +316,8 @@ static void fixes_pointer_barrier_clamp_test(void)
     assert(cy == barrier.y1);
 }
 
-int main(int argc, char** argv)
+int
+main(int argc, char **argv)
 {
 
     fixes_pointer_barriers_test();