fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012

1 files changed, 19 insertions, 18 deletions

diff --git a/xorg-server/hw/xquartz/darwinfb.h b/xorg-server/hw/xquartz/darwinfb.h
index dab6d4b86..5de360d75 100644
--- a/xorg-server/hw/xquartz/darwinfb.h
+++ b/xorg-server/hw/xquartz/darwinfb.h
@@ -32,25 +32,26 @@
 
 typedef struct {
     void                *framebuffer;
-    int                 x;
-    int                 y;
-    int                 width;
-    int                 height;
-    int                 pitch;
-    int                 depth;
-    int                 visuals;
-    int                 bitsPerRGB;
-    int                 bitsPerPixel;
-    int                 preferredCVC;
-    Pixel               redMask;
-    Pixel               greenMask;
-    Pixel               blueMask;
+    int x;
+    int y;
+    int width;
+    int height;
+    int pitch;
+    int depth;
+    int visuals;
+    int bitsPerRGB;
+    int bitsPerPixel;
+    int preferredCVC;
+    Pixel redMask;
+    Pixel greenMask;
+    Pixel blueMask;
 } DarwinFramebufferRec, *DarwinFramebufferPtr;
 
-#define MASK_LH(l,h) (((1 << (1 + (h) - (l))) - 1) << (l))
-#define BM_ARGB(a,r,g,b) MASK_LH(0, (b) - 1)
-#define GM_ARGB(a,r,g,b) MASK_LH(b, (b) + (g) - 1)
-#define RM_ARGB(a,r,g,b) MASK_LH((b) + (g), (b) + (g) + (r) - 1)
-#define AM_ARGB(a,r,g,b) MASK_LH((b) + (g) + (r), (b) + (g) + (r) + (a) - 1)
+#define MASK_LH(l, h)       (((1 << (1 + (h) - (l))) - 1) << (l))
+#define BM_ARGB(a, r, g, b) MASK_LH(0, (b) - 1)
+#define GM_ARGB(a, r, g, b) MASK_LH(b, (b) + (g) - 1)
+#define RM_ARGB(a, r, g, b) MASK_LH((b) + (g), (b) + (g) + (r) - 1)
+#define AM_ARGB(a, r, g, b) MASK_LH((b) + (g) + (r), \
+                                    (b) + (g) + (r) + (a) - 1)
 
 #endif  /* _DARWIN_FB_H */