pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-private.h |   13 -------------
 pixman/pixman-vmx.c     |    7 +++++++
 2 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit 3d93070db88563b5a8f1e07f53f86c5e8ada8bbf
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed May 27 21:51:00 2009 -0400

    Really fix PPC build.
    
    Add a pixman_composeFunctions variable to pixman-vmx.c.

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 9cb0968..3280af7 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -184,19 +184,6 @@ typedef struct _FbComposeData {
     uint16_t	 height;
 } FbComposeData;
 
-typedef struct _FbComposeFunctions32 {
-    CombineFunc32 *combineU;
-    CombineFunc32 *combineC;
-} FbComposeFunctions32;
-
-typedef struct _FbComposeFunctions64 {
-    CombineFunc64 *combineU;
-    CombineFunc64 *combineC;
-} FbComposeFunctions64;
-
-extern FbComposeFunctions32 pixman_composeFunctions;
-extern FbComposeFunctions64 pixman_composeFunctions64;
-
 void pixman_composite_rect_general_accessors (const FbComposeData *data,
                                               void *src_buffer,
                                               void *mask_buffer,
diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c
index adcd967..b681b7a 100644
--- a/pixman/pixman-vmx.c
+++ b/pixman/pixman-vmx.c
@@ -30,6 +30,13 @@
 #include "pixman-combine32.h"
 #include <altivec.h>
 
+typedef struct _FbComposeFunctions32 {
+    CombineFunc32 combineU[PIXMAN_OP_LAST];
+    CombineFunc32 combineC[PIXMAN_OP_LAST];
+} FbComposeFunctions32;
+
+static FbComposeFunctions32 pixman_composeFunctions;
+
 static force_inline vector unsigned int
 splat_alpha (vector unsigned int pix) {
     return vec_perm (pix, pix,