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, 66 insertions, 68 deletions

diff --git a/xorg-server/hw/xwin/winrop.c b/xorg-server/hw/xwin/winrop.c
index f4818920a..1f9ff7320 100644
--- a/xorg-server/hw/xwin/winrop.c
+++ b/xorg-server/hw/xwin/winrop.c
@@ -37,108 +37,106 @@
 #include "win.h"
 
 void
-ROP16 (HDC hdc, int rop);
-
-int g_copyROP[16] = { 	0xFF0062, /* GXclear 		- 0 */
-		 	0x8800C6, /* GXand 		- S & D */
-		 	0x440328, /* GXandReverse  	- S & !D */
-		 	0xCC0020, /* GXcopy 		- S */
-		 	0x220326, /* GXandInverted 	- !S & D */
-		 	0xAA0029, /* GXnoop		- D */
-		 	0x660046, /* GXxor 		- S ^ D */
-		 	0xEE0086, /* GXor		- S | D */
-		 	0x1100A6, /* GXnor 		- !S & !D */
-		 	0x990126, /* GXequiv		- !S ^ D */
-		 	0x550009, /* GXinvert		- !D */
-		 	0xDD0228, /* GXorReverse	- S | !D */
-		 	0x330008, /* GXcopyInverted	- !S */
-		 	0xBB0226, /* GXorInverted	- !S | D */
-		 	0x7700C6, /* GXnand		- !S | !D */
-		 	0x000042  /* GXset		- 1 */
+ ROP16(HDC hdc, int rop);
+
+int g_copyROP[16] = { 0xFF0062, /* GXclear            - 0 */
+    0x8800C6,                   /* GXand              - S & D */
+    0x440328,                   /* GXandReverse       - S & !D */
+    0xCC0020,                   /* GXcopy             - S */
+    0x220326,                   /* GXandInverted      - !S & D */
+    0xAA0029,                   /* GXnoop             - D */
+    0x660046,                   /* GXxor              - S ^ D */
+    0xEE0086,                   /* GXor               - S | D */
+    0x1100A6,                   /* GXnor              - !S & !D */
+    0x990126,                   /* GXequiv            - !S ^ D */
+    0x550009,                   /* GXinvert           - !D */
+    0xDD0228,                   /* GXorReverse        - S | !D */
+    0x330008,                   /* GXcopyInverted     - !S */
+    0xBB0226,                   /* GXorInverted       - !S | D */
+    0x7700C6,                   /* GXnand             - !S | !D */
+    0x000042                    /* GXset              - 1 */
 };
 
-int g_patternROP[16] = {0xFF0062, /* GXclear		- 0 */
-		 	0xA000C9, /* GXand 		- P & D */
-		 	0xF50225, /* GXandReverse	- P & !D */
-		 	0xF00021, /* GXcopy 		- P */
-		 	0x5F00E9, /* GXandInverted 	- !P & D */
-		 	0xAA0029, /* GXnoop		- D */
-		 	0xA50065, /* GXxor		- P ^ D */
-		 	0xA000C9, /* GXor		- P | D */
-		 	0x5F00E9, /* GXnor		- !P & !D */
-		 	0x5A0049, /* GXequiv		- !P ^ D */
-		 	0x550009, /* GXinvert		- !D */
-		 	0x500325, /* GXorReverse	- P | !D */
-		 	0x0F0001, /* GXcopyInverted	- !P */
-		 	0x0A0329, /* GXorInverted	- !P | D */
-		 	0x0500A9, /* GXnand		- !P | !D */
-		 	0x000042  /* GXset		- 1 */
+int g_patternROP[16] = { 0xFF0062,      /* GXclear            - 0 */
+    0xA000C9,                   /* GXand              - P & D */
+    0xF50225,                   /* GXandReverse       - P & !D */
+    0xF00021,                   /* GXcopy             - P */
+    0x5F00E9,                   /* GXandInverted      - !P & D */
+    0xAA0029,                   /* GXnoop             - D */
+    0xA50065,                   /* GXxor              - P ^ D */
+    0xA000C9,                   /* GXor               - P | D */
+    0x5F00E9,                   /* GXnor              - !P & !D */
+    0x5A0049,                   /* GXequiv            - !P ^ D */
+    0x550009,                   /* GXinvert           - !D */
+    0x500325,                   /* GXorReverse        - P | !D */
+    0x0F0001,                   /* GXcopyInverted     - !P */
+    0x0A0329,                   /* GXorInverted       - !P | D */
+    0x0500A9,                   /* GXnand             - !P | !D */
+    0x000042                    /* GXset              - 1 */
 };
 
-
 void
-ROP16 (HDC hdc, int rop)
+ROP16(HDC hdc, int rop)
 {
-  switch (rop)
-    {
+    switch (rop) {
     case GXclear:
-      SetROP2 (hdc, R2_BLACK);
-      break;
+        SetROP2(hdc, R2_BLACK);
+        break;
 
     case GXand:
-      SetROP2 (hdc, R2_MASKPEN);
-      break;
+        SetROP2(hdc, R2_MASKPEN);
+        break;
 
     case GXandReverse:
-      SetROP2 (hdc, R2_MASKPENNOT);
-      break;
+        SetROP2(hdc, R2_MASKPENNOT);
+        break;
 
     case GXcopy:
-      SetROP2 (hdc, R2_COPYPEN);
-      break;
+        SetROP2(hdc, R2_COPYPEN);
+        break;
 
     case GXnoop:
-      SetROP2 (hdc, R2_NOP);
-      break;
+        SetROP2(hdc, R2_NOP);
+        break;
 
     case GXxor:
-      SetROP2 (hdc, R2_XORPEN);
-      break;
+        SetROP2(hdc, R2_XORPEN);
+        break;
 
     case GXor:
-      SetROP2 (hdc, R2_MERGEPEN);
-      break;
+        SetROP2(hdc, R2_MERGEPEN);
+        break;
 
     case GXnor:
-      SetROP2 (hdc, R2_NOTMERGEPEN);
-      break;
+        SetROP2(hdc, R2_NOTMERGEPEN);
+        break;
 
     case GXequiv:
-      SetROP2 (hdc, R2_NOTXORPEN);
-      break;
+        SetROP2(hdc, R2_NOTXORPEN);
+        break;
 
     case GXinvert:
-      SetROP2 (hdc, R2_NOT);
-      break;
+        SetROP2(hdc, R2_NOT);
+        break;
 
     case GXorReverse:
-      SetROP2 (hdc, R2_MERGEPENNOT);
-      break;
+        SetROP2(hdc, R2_MERGEPENNOT);
+        break;
 
     case GXcopyInverted:
-      SetROP2 (hdc, R2_NOTCOPYPEN);
-      break;
+        SetROP2(hdc, R2_NOTCOPYPEN);
+        break;
 
     case GXorInverted:
-      SetROP2 (hdc, R2_MERGENOTPEN);
-      break;
+        SetROP2(hdc, R2_MERGENOTPEN);
+        break;
 
     case GXnand:
-      SetROP2 (hdc, R2_NOTMASKPEN);
-      break;
+        SetROP2(hdc, R2_NOTMASKPEN);
+        break;
 
     case GXset:
-      SetROP2 (hdc, R2_WHITE);
-      break;
+        SetROP2(hdc, R2_WHITE);
+        break;
     }
 }