pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/combine.pl |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1248418854b0e6e2f7fa8c2760a05b6604d3ded7
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Sun Jun 8 20:01:37 2008 -0400

    Fix forgotten use of pixman-combine.h

diff --git a/pixman/combine.pl b/pixman/combine.pl
index 7258ff3..f8df603 100644
--- a/pixman/combine.pl
+++ b/pixman/combine.pl
@@ -75,6 +75,7 @@ while (<STDIN>) {
 
     # Change the header for the 64-bit version
     s/pixman-combine.h/pixman-combine64.h/ if $size == 16;
+    s/pixman-combine.h/pixman-combine32.h/ if $size == 8;
 
     print;
 }