[Xquartz-changes] xserver: Branch 'for-keith'

[Jeremy Huddleston]

 include/misc.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6eae9fa28445b6cfa09061b338242df5116aafe8
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Sep 28 17:27:45 2011 -0400

    Remove incorrect & in swap_uint32
    
    Caused by commit 893e86a4, and hidden by the (char *) cast.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
    Tested-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/include/misc.h b/include/misc.h
index 0867746..dc03911 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -279,7 +279,7 @@ static inline int __builtin_constant_p(int x)
 /* byte swap a 32-bit value */
 static inline void swap_uint32(uint32_t *x)
 {
-	char n = ((char *) &x)[0];
+	char n = ((char *) x)[0];
 	((char *) x)[0] = ((char *) x)[3];
 	((char *) x)[3] = n;
 	n = ((char *) x)[1];