--- a/src/gui/painting/qdrawhelper_p.h	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/gui/painting/qdrawhelper_p.h	Thu Jul 22 16:41:55 2010 +0100
@@ -67,17 +67,15 @@
 #include "QtGui/qscreen_qws.h"
 #endif
 
-// Disable MMX and SSE on Mac/PPC builds, or if the compiler
-// does not support -Xarch argument passing
-#if defined(QT_NO_MAC_XARCH) || (defined(Q_OS_DARWIN) && (defined(__ppc__) || defined(__ppc64__)))
-#undef QT_HAVE_SSE2
+QT_BEGIN_NAMESPACE
+
+#if defined(Q_OS_MAC) && (defined(__ppc__) || defined(__ppc64__))
+#undef QT_HAVE_MMX
 #undef QT_HAVE_SSE
+#undef QT_HAVE_SSE2
 #undef QT_HAVE_3DNOW
-#undef QT_HAVE_MMX
 #endif
 
-QT_BEGIN_NAMESPACE
-
 #if defined(Q_CC_MSVC) && _MSCVER <= 1300 && !defined(Q_CC_INTEL)
 #define Q_STATIC_TEMPLATE_SPECIALIZATION static
 #else
@@ -1649,7 +1647,7 @@
         return;
     }
 
-    const int align = (long(dest) & 3);
+    const int align = (quintptr(dest) & 3);
     switch (align) {
     case 1: *dest++ = qrgb666(*src++); --count;
     case 2: *dest++ = qrgb666(*src++); --count;