libX11 xserver pixman mesa git update 16 Apr 2012

1 files changed, 47 insertions, 48 deletions

diff --git a/xorg-server/hw/xfree86/xaa/xaacexp.h b/xorg-server/hw/xfree86/xaa/xaacexp.h
index 56bcda69a..6fde54c65 100644
--- a/xorg-server/hw/xfree86/xaa/xaacexp.h
+++ b/xorg-server/hw/xfree86/xaa/xaacexp.h
@@ -1,5 +1,4 @@
 
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -13,76 +12,76 @@
 #endif
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
-# define SHIFT_L(value, shift) ((value) >> (shift))
-# define SHIFT_R(value, shift) ((value) << (shift))
+#define SHIFT_L(value, shift) ((value) >> (shift))
+#define SHIFT_R(value, shift) ((value) << (shift))
 #else
-# define SHIFT_L(value, shift) ((value) << (shift))
-# define SHIFT_R(value, shift) ((value) >> (shift))
+#define SHIFT_L(value, shift) ((value) << (shift))
+#define SHIFT_R(value, shift) ((value) >> (shift))
 #endif
 
 #ifndef MSBFIRST
-# ifdef FIXEDBASE
-#   define WRITE_IN_BITORDER(dest, offset, data) *(dest) = data; 
-# else  
-#   define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = data;
-# endif
-#else	
-# ifdef FIXEDBASE
-#   define WRITE_IN_BITORDER(dest, offset, data) *(dest) = SWAP_BITS_IN_BYTES(data);
-# else  
-#   define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = SWAP_BITS_IN_BYTES(data)
-# endif
+#ifdef FIXEDBASE
+#define WRITE_IN_BITORDER(dest, offset, data) *(dest) = data;
+#else
+#define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = data;
+#endif
+#else
+#ifdef FIXEDBASE
+#define WRITE_IN_BITORDER(dest, offset, data) *(dest) = SWAP_BITS_IN_BYTES(data);
+#else
+#define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = SWAP_BITS_IN_BYTES(data)
+#endif
 #endif
 
 #ifdef FIXEDBASE
-# ifdef MSBFIRST
-#  define WRITE_BITS(b)   *base = SWAP_BITS_IN_BYTES(b)
-#  define WRITE_BITS1(b) { \
+#ifdef MSBFIRST
+#define WRITE_BITS(b)   *base = SWAP_BITS_IN_BYTES(b)
+#define WRITE_BITS1(b) { \
 	*base = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; }
-#  define WRITE_BITS2(b) { \
+#define WRITE_BITS2(b) { \
 	*base = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*base = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \
 		byte_reversed_expand3[((b) & 0xFF0000) >> 16] << 16; }
-#  define WRITE_BITS3(b) { \
+#define WRITE_BITS3(b) { \
 	*base = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*base = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \
 		byte_reversed_expand3[((b) & 0xFF0000) >> 16] << 16; \
 	*base = byte_reversed_expand3[((b) & 0xFF0000) >> 16] >> 16 | \
 		byte_reversed_expand3[((b) & 0xFF000000) >> 24] << 8; }
-# else
-#  define WRITE_BITS(b)   *base = (b)
-#  define WRITE_BITS1(b) { \
+#else
+#define WRITE_BITS(b)   *base = (b)
+#define WRITE_BITS1(b) { \
 	*base = byte_expand3[(b) & 0xFF] | \
 		byte_expand3[((b) & 0xFF00) >> 8] << 24; }
-#  define WRITE_BITS2(b) { \
+#define WRITE_BITS2(b) { \
 	*base = byte_expand3[(b) & 0xFF] | \
 		byte_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*base = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \
 		byte_expand3[((b) & 0xFF0000) >> 16] << 16; }
-#  define WRITE_BITS3(b) { \
+#define WRITE_BITS3(b) { \
 	*base = byte_expand3[(b) & 0xFF] | \
 		byte_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*base = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \
 		byte_expand3[((b) & 0xFF0000) >> 16] << 16; \
 	*base = byte_expand3[((b) & 0xFF0000) >> 16] >> 16 | \
 		byte_expand3[((b) & 0xFF000000) >> 24] << 8; }
-# endif
+#endif
 #else
-# ifdef MSBFIRST
-#  define WRITE_BITS(b)   *(base++) = SWAP_BITS_IN_BYTES(b)
-#  define WRITE_BITS1(b) { \
+#ifdef MSBFIRST
+#define WRITE_BITS(b)   *(base++) = SWAP_BITS_IN_BYTES(b)
+#define WRITE_BITS1(b) { \
 	*(base++) = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; }
-#  define WRITE_BITS2(b) { \
+#define WRITE_BITS2(b) { \
 	*(base) = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*(base + 1) = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \
 		byte_reversed_expand3[((b) & 0xFF0000) >> 16] << 16; \
 	base += 2; }
-#  define WRITE_BITS3(b) { \
+#define WRITE_BITS3(b) { \
 	*(base) = byte_reversed_expand3[(b) & 0xFF] | \
 		byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*(base + 1) = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \
@@ -90,18 +89,18 @@
 	*(base + 2) = byte_reversed_expand3[((b) & 0xFF0000) >> 16] >> 16 | \
 		byte_reversed_expand3[((b) & 0xFF000000) >> 24] << 8; \
 	base += 3; }
-# else
-#  define WRITE_BITS(b)   *(base++) = (b)
-#  define WRITE_BITS1(b) { \
+#else
+#define WRITE_BITS(b)   *(base++) = (b)
+#define WRITE_BITS1(b) { \
 	*(base++) = byte_expand3[(b) & 0xFF] | \
 		byte_expand3[((b) & 0xFF00) >> 8] << 24; }
-#  define WRITE_BITS2(b) { \
+#define WRITE_BITS2(b) { \
 	*(base) = byte_expand3[(b) & 0xFF] | \
 		byte_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*(base + 1) = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \
 		byte_expand3[((b) & 0xFF0000) >> 16] << 16; \
 	base += 2; }
-#  define WRITE_BITS3(b) { \
+#define WRITE_BITS3(b) { \
 	*(base) = byte_expand3[(b) & 0xFF] | \
 		byte_expand3[((b) & 0xFF00) >> 8] << 24; \
 	*(base + 1) = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \
@@ -109,19 +108,19 @@
 	*(base + 2) = byte_expand3[((b) & 0xFF0000) >> 16] >> 16 | \
 		byte_expand3[((b) & 0xFF000000) >> 24] << 8; \
 	base += 3; }
-# endif
+#endif
 #endif
 
 #ifdef FIXEDBASE
-# ifdef MSBFIRST
-#  define EXPNAME(x) x##MSBFirstFixedBase
-# else
-#  define EXPNAME(x) x##LSBFirstFixedBase
-# endif
+#ifdef MSBFIRST
+#define EXPNAME(x) x##MSBFirstFixedBase
 #else
-# ifdef MSBFIRST
-#  define EXPNAME(x) x##MSBFirst
-# else
-#  define EXPNAME(x) x##LSBFirst
-# endif
+#define EXPNAME(x) x##LSBFirstFixedBase
+#endif
+#else
+#ifdef MSBFIRST
+#define EXPNAME(x) x##MSBFirst
+#else
+#define EXPNAME(x) x##LSBFirst
+#endif
 #endif