pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-arm-neon.c |    1 +
 pixman/pixman-arm-simd.c |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 10aa32315529eaff848b8348cad47b2673f853cf
Author: Siarhei Siamashka <siarhei.siamashka at nokia.com>
Date:   Sat Jun 27 11:56:38 2009 +0300

    Really fix ARM build.
    
    Commit 9d3f71d726c8b959b64c3e6b43ca4d3ccb320c32 broke the build
    on ARM architectures by just removing custom include files and
    not providing "pixman-private.h" as a replacement.

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index cbd3a92..681c294 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -32,6 +32,7 @@
 
 #include <arm_neon.h>
 #include <string.h>
+#include "pixman-private.h"
 
 // Deal with an intrinsic that is defined differently in GCC
 #if !defined(__ARMCC_VERSION) && !defined(__pld)
diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index cccb21f..fc9e1e5 100644
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -27,6 +27,8 @@
 #include <config.h>
 #endif
 
+#include "pixman-private.h"
+
 static void
 fbCompositeSrcAdd_8000x8000arm (
                             pixman_implementation_t * impl,