pixman: Branch 'master'

[Søren Sandmann Pedersen]

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

New commits:
commit 45074018c3c221272719ecb2bf9f4ec66ffb8729
Author: Alp Toker <alp at toker.com>
Date:   Tue Jan 15 16:34:57 2008 -0500

    Avoid use of C++ keyword xor in header

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 7248f86..2fd3133 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -370,7 +370,7 @@ pixman_bool_t pixman_fill (uint32_t *bits,
 			   int y,
 			   int width,
 			   int height,
-			   uint32_t xor);
+			   uint32_t _xor);
 /*
  * Images
  */