pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-cpu.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 71ff55a3e567ace21e9120f826270253e7ec5edd
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Thu Aug 5 19:00:56 2010 -0400

    Fix Altivec/OpenBSD patch
    
    As Brad pointed out, I pushed the wrong version of this patch.

diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
index 1b31885..e4fb1e4 100644
--- a/pixman/pixman-cpu.c
+++ b/pixman/pixman-cpu.c
@@ -74,9 +74,9 @@ pixman_have_vmx (void)
 	int mib[2] = { CTL_MACHDEP, CPU_ALTIVEC };
 	size_t length = sizeof(have_vmx);
 	int error =
-	    sysctl (&mib, 2, &have_vmx, &length, NULL, 0);
+	    sysctl (mib, 2, &have_vmx, &length, NULL, 0);
 
-	if (error)
+	if (error != 0)
 	    have_vmx = FALSE;
 
 	initialized = TRUE;