libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 33 insertions, 41 deletions

diff --git a/xorg-server/include/colormapst.h b/xorg-server/include/colormapst.h
index bb79c86d2..ac0c62e70 100644
--- a/xorg-server/include/colormapst.h
+++ b/xorg-server/include/colormapst.h
@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
@@ -53,67 +52,60 @@ SOFTWARE.
 #include "privates.h"
 
 /* Shared color -- the color is used by AllocColorPlanes */
-typedef struct
-{
+typedef struct {
     unsigned short color;
-    short  refcnt;
+    short refcnt;
 } SHAREDCOLOR;
 
 /* LOCO -- a local color for a PseudoColor cell. DirectColor maps always
  * use the first value (called red) in the structure.  What channel they
  * are really talking about depends on which map they are in. */
-typedef struct
-{
-    unsigned short	red, green, blue;
+typedef struct {
+    unsigned short red, green, blue;
 } LOCO;
 
 /* SHCO -- a shared color for a PseudoColor cell. Used with AllocColorPlanes.
  * DirectColor maps always use the first value (called red) in the structure.
  * What channel they are really talking about depends on which map they
  * are in. */
-typedef struct 
-{
+typedef struct {
     SHAREDCOLOR *red, *green, *blue;
 } SHCO;
 
-
 /* color map entry */
-typedef struct _CMEntry
-{
-    union
-    {
-	LOCO	local;
-	SHCO	shco;
+typedef struct _CMEntry {
+    union {
+        LOCO local;
+        SHCO shco;
     } co;
-    short	refcnt;
-    Bool	fShared;
+    short refcnt;
+    Bool fShared;
 } Entry;
 
 /* COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor
  * only needs one cell table, we arbitrarily pick red.  We keep track
  * of that table with freeRed, numPixelsRed, and clientPixelsRed */
 
-typedef struct _ColormapRec
-{
-    VisualPtr	pVisual;
-    short	class;		/* PseudoColor or DirectColor */
-    XID		mid;		/* client's name for colormap */
-    ScreenPtr	pScreen;	/* screen map is associated with */
-    short	flags;		/* 1 = IsDefault
-				 * 2 = AllAllocated */
-    int		freeRed;
-    int		freeGreen;
-    int		freeBlue;
-    int		*numPixelsRed;	
-    int		*numPixelsGreen;	
-    int		*numPixelsBlue;	
-    Pixel	**clientPixelsRed;
-    Pixel	**clientPixelsGreen;
-    Pixel	**clientPixelsBlue;
-    Entry	*red;
-    Entry 	*green;
-    Entry	*blue;
-    PrivateRec	*devPrivates;
+typedef struct _ColormapRec {
+    VisualPtr pVisual;
+    short class;                /* PseudoColor or DirectColor */
+    XID mid;                    /* client's name for colormap */
+    ScreenPtr pScreen;          /* screen map is associated with */
+    short flags;                /* 1 = IsDefault
+                                 * 2 = AllAllocated */
+    int freeRed;
+    int freeGreen;
+    int freeBlue;
+    int *numPixelsRed;
+    int *numPixelsGreen;
+    int *numPixelsBlue;
+    Pixel **clientPixelsRed;
+    Pixel **clientPixelsGreen;
+    Pixel **clientPixelsBlue;
+    Entry *red;
+    Entry *green;
+    Entry *blue;
+    PrivateRec *devPrivates;
 } ColormapRec;
-	      
-#endif /* COLORMAP_H */
+
+#endif                          /* COLORMAP_H */