Update to xserver 1.12.2. tested by naddy@, krw@, mpi@.

1 files changed, 15 insertions, 22 deletions

diff --git a/xserver/fb/fbcmap_mi.c b/xserver/fb/fbcmap_mi.c
index 227da3118..7b6a2c679 100644
--- a/xserver/fb/fbcmap_mi.c
+++ b/xserver/fb/fbcmap_mi.c
@@ -27,7 +27,6 @@
  * XFree86Server being defined.
  */
 
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
@@ -37,7 +36,7 @@
 #include "micmap.h"
 
 int
-fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
+fbListInstalledColormaps(ScreenPtr pScreen, Colormap * pmaps)
 {
     return miListInstalledColormaps(pScreen, pmaps);
 }
@@ -55,10 +54,8 @@ fbUninstallColormap(ColormapPtr pmap)
 }
 
 void
-fbResolveColor(unsigned short   *pred,
-	       unsigned short   *pgreen,
-	       unsigned short   *pblue,
-	       VisualPtr	pVisual)
+fbResolveColor(unsigned short *pred,
+               unsigned short *pgreen, unsigned short *pblue, VisualPtr pVisual)
 {
     miResolveColor(pred, pgreen, pblue, pVisual);
 }
@@ -70,10 +67,8 @@ fbInitializeColormap(ColormapPtr pmap)
 }
 
 int
-fbExpandDirectColors (ColormapPtr   pmap,
-		      int	    ndef,
-		      xColorItem    *indefs,
-		      xColorItem    *outdefs)
+fbExpandDirectColors(ColormapPtr pmap,
+                     int ndef, xColorItem * indefs, xColorItem * outdefs)
 {
     return miExpandDirectColors(pmap, ndef, indefs, outdefs);
 }
@@ -91,14 +86,14 @@ fbClearVisualTypes(void)
 }
 
 Bool
-fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
+fbSetVisualTypes(int depth, int visuals, int bitsPerRGB)
 {
     return miSetVisualTypes(depth, visuals, bitsPerRGB, -1);
 }
 
 Bool
-fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
-                          Pixel redMask, Pixel greenMask, Pixel blueMask)
+fbSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
+                         Pixel redMask, Pixel greenMask, Pixel blueMask)
 {
     return miSetVisualTypesAndMasks(depth, visuals, bitsPerRGB, -1,
                                     redMask, greenMask, blueMask);
@@ -110,15 +105,13 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
  * the set which can be used with this version of fb.
  */
 Bool
-fbInitVisuals (VisualPtr    *visualp, 
-	       DepthPtr	    *depthp,
-	       int	    *nvisualp,
-	       int	    *ndepthp,
-	       int	    *rootDepthp,
-	       VisualID	    *defaultVisp,
-	       unsigned long	sizes,
-	       int	    bitsPerRGB)
+fbInitVisuals(VisualPtr * visualp,
+              DepthPtr * depthp,
+              int *nvisualp,
+              int *ndepthp,
+              int *rootDepthp,
+              VisualID * defaultVisp, unsigned long sizes, int bitsPerRGB)
 {
     return miInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp,
-			 defaultVisp, sizes, bitsPerRGB, -1);
+                         defaultVisp, sizes, bitsPerRGB, -1);
 }