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, 50 insertions, 50 deletions

diff --git a/xorg-server/hw/xfree86/utils/cvt/cvt.c b/xorg-server/hw/xfree86/utils/cvt/cvt.c
index 0de5ffea4..9483964e0 100644
--- a/xorg-server/hw/xfree86/utils/cvt/cvt.c
+++ b/xorg-server/hw/xfree86/utils/cvt/cvt.c
@@ -30,6 +30,7 @@ void
 FatalError(const char *f, ...)
 {
     va_list args;
+
     va_start(args, f);
     vfprintf(stderr, f, args);
     va_end(args);
@@ -69,22 +70,21 @@ XNFcalloc(unsigned long n)
  */
 static Bool
 CVTCheckStandard(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
-                     Bool Verbose)
+                 Bool Verbose)
 {
-    Bool  IsCVT = TRUE;
+    Bool IsCVT = TRUE;
 
     if ((!(VDisplay % 3) && ((VDisplay * 4 / 3) == HDisplay)) ||
         (!(VDisplay % 9) && ((VDisplay * 16 / 9) == HDisplay)) ||
         (!(VDisplay % 10) && ((VDisplay * 16 / 10) == HDisplay)) ||
         (!(VDisplay % 4) && ((VDisplay * 5 / 4) == HDisplay)) ||
-        (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay)))
-        ;
+        (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay)));
     else {
         if (Verbose)
             fprintf(stderr, "Warning: Aspect Ratio is not CVT standard.\n");
         IsCVT = FALSE;
     }
-    
+
     if ((VRefresh != 50.0) && (VRefresh != 60.0) &&
         (VRefresh != 75.0) && (VRefresh != 85.0)) {
         if (Verbose)
@@ -92,11 +92,10 @@ CVTCheckStandard(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
                     "(50, 60, 75 or 85Hz).\n");
         IsCVT = FALSE;
     }
-    
+
     return IsCVT;
 }
 
-
 /*
  * I'm not documenting --interlaced for obvious reasons, even though I did
  * implement it. I also can't deny having looked at gtf here.
@@ -113,20 +112,21 @@ PrintUsage(char *Name)
             "(default: normal blanking).\n");
     fprintf(stderr, "            X : Desired horizontal resolution "
             "(multiple of 8, required).\n");
-    fprintf(stderr, "            Y : Desired vertical resolution (required).\n");
-    fprintf(stderr, "      refresh : Desired refresh rate (default: 60.0Hz).\n");
+    fprintf(stderr,
+            "            Y : Desired vertical resolution (required).\n");
+    fprintf(stderr,
+            "      refresh : Desired refresh rate (default: 60.0Hz).\n");
     fprintf(stderr, "\n");
 
     fprintf(stderr, "Calculates VESA CVT (Coordinated Video Timing) modelines"
-	    " for use with X.\n");
+            " for use with X.\n");
 }
 
-
 /*
  *
  */
 static void
-PrintComment(DisplayModeRec *Mode, Bool CVT, Bool Reduced)
+PrintComment(DisplayModeRec * Mode, Bool CVT, Bool Reduced)
 {
     printf("# %dx%d %.2f Hz ", Mode->HDisplay, Mode->VDisplay, Mode->VRefresh);
 
@@ -154,16 +154,16 @@ PrintComment(DisplayModeRec *Mode, Bool CVT, Bool Reduced)
             printf("-R");
 
         printf(") ");
-    } else
+    }
+    else
         printf("(CVT) ");
 
     printf("hsync: %.2f kHz; ", Mode->HSync);
-    printf("pclk: %.2f MHz", ((float ) Mode->Clock) / 1000.0);
+    printf("pclk: %.2f MHz", ((float) Mode->Clock) / 1000.0);
 
     printf("\n");
 }
 
-
 /*
  * Originally grabbed from xf86Mode.c.
  *
@@ -179,9 +179,9 @@ PrintModeline(DisplayModePtr Mode, int HDisplay, int VDisplay, float VRefresh,
     else
         printf("Modeline \"%dx%d_%.2f\"  ", HDisplay, VDisplay, VRefresh);
 
-    printf("%6.2f  %i %i %i %i  %i %i %i %i", Mode->Clock/1000., Mode->HDisplay,
-           Mode->HSyncStart, Mode->HSyncEnd, Mode->HTotal, Mode->VDisplay,
-           Mode->VSyncStart, Mode->VSyncEnd, Mode->VTotal);
+    printf("%6.2f  %i %i %i %i  %i %i %i %i", Mode->Clock / 1000.,
+           Mode->HDisplay, Mode->HSyncStart, Mode->HSyncEnd, Mode->HTotal,
+           Mode->VDisplay, Mode->VSyncStart, Mode->VSyncEnd, Mode->VTotal);
 
     if (Mode->Flags & V_INTERLACE)
         printf(" interlace");
@@ -197,19 +197,18 @@ PrintModeline(DisplayModePtr Mode, int HDisplay, int VDisplay, float VRefresh,
     printf("\n");
 }
 
-
 /*
  *
  */
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-    DisplayModeRec  *Mode;
-    int  HDisplay = 0, VDisplay = 0;
-    float  VRefresh = 0.0;
-    Bool  Reduced = FALSE, Verbose = FALSE, IsCVT;
-    Bool  Interlaced = FALSE;
-    int  n;
+    DisplayModeRec *Mode;
+    int HDisplay = 0, VDisplay = 0;
+    float VRefresh = 0.0;
+    Bool Reduced = FALSE, Verbose = FALSE, IsCVT;
+    Bool Interlaced = FALSE;
+    int n;
 
     if ((argc < 3) || (argc > 7)) {
         PrintUsage(argv[0]);
@@ -230,27 +229,28 @@ main (int argc, char *argv[])
         else if (!strcmp(argv[n], "-h") || !strcmp(argv[n], "--help")) {
             PrintUsage(argv[0]);
             return 0;
-        } else if (!HDisplay) {
+        }
+        else if (!HDisplay) {
             HDisplay = atoi(argv[n]);
-	    if (!HDisplay) {
-		PrintUsage(argv[0]);
-		return 1;
-	    }
-	}
+            if (!HDisplay) {
+                PrintUsage(argv[0]);
+                return 1;
+            }
+        }
         else if (!VDisplay) {
             VDisplay = atoi(argv[n]);
-	    if (!VDisplay) {
-		PrintUsage(argv[0]);
-		return 1;
-	    }
-	}
+            if (!VDisplay) {
+                PrintUsage(argv[0]);
+                return 1;
+            }
+        }
         else if (!VRefresh) {
             VRefresh = atof(argv[n]);
-	    if (!VRefresh) {
-		PrintUsage(argv[0]);
-		return 1;
-	    }
-	}
+            if (!VRefresh) {
+                PrintUsage(argv[0]);
+                return 1;
+            }
+        }
         else {
             PrintUsage(argv[0]);
             return 1;
@@ -273,13 +273,13 @@ main (int argc, char *argv[])
     }
 
     if (Reduced) {
-	if ((VRefresh / 60.0) != floor(VRefresh / 60.0)) {
-	    fprintf(stderr,
-		    "\nERROR: Multiple of 60Hz refresh rate required for "
-		    " reduced blanking.\n");
-	    PrintUsage(argv[0]);
-	    return 0;
-	}
+        if ((VRefresh / 60.0) != floor(VRefresh / 60.0)) {
+            fprintf(stderr,
+                    "\nERROR: Multiple of 60Hz refresh rate required for "
+                    " reduced blanking.\n");
+            PrintUsage(argv[0]);
+            return 0;
+        }
     }
 
     IsCVT = CVTCheckStandard(HDisplay, VDisplay, VRefresh, Reduced, Verbose);
@@ -288,6 +288,6 @@ main (int argc, char *argv[])
 
     PrintComment(Mode, IsCVT, Reduced);
     PrintModeline(Mode, HDisplay, VDisplay, VRefresh, Reduced);
-    
+
     return 0;
 }