pixman/pixman-mmx.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 10a227ed9311529cd98cb8b3aa1b8d48dad8b517
Author: Vladimir Vukicevic <vladimir at pobox.com>
Date: Wed Mar 26 16:10:43 2008 -0700
Fix up unsigned long long/ullong usage
A few stray "unsigned long long"s were in place, along with
a ullong typedef outside of the appropriate ifdef.
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 9b1c2b4..8afbcb8 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -76,9 +76,8 @@
/* --------------- MMX primitivess ------------------------------------ */
-typedef unsigned long long ullong;
-
#ifdef __GNUC__
+typedef unsigned long long ullong;
typedef ullong mmxdatafield;
#endif
#ifdef _MSC_VER
@@ -1624,7 +1623,7 @@ fbCompositeSolidMask_nx8x8888mmx (pixman_op_t op,
if (srca == 0)
return;
- srcsrc = (unsigned long long)src << 32 | src;
+ srcsrc = (ullong)src << 32 | src;
fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
@@ -1667,7 +1666,7 @@ fbCompositeSolidMask_nx8x8888mmx (pixman_op_t op,
if (srca == 0xff && (m0 & m1) == 0xff)
{
- *(unsigned long long *)dst = srcsrc;
+ *(ullong *)dst = srcsrc;
}
else if (m0 | m1)
{
@@ -1988,7 +1987,7 @@ fbCompositeSolidMask_nx8x0565mmx (pixman_op_t op,
int dstStride, maskStride;
uint16_t w;
__m64 vsrc, vsrca, tmp;
- unsigned long long srcsrcsrcsrc, src16;
+ ullong srcsrcsrcsrc, src16;
CHECKPOINT();
@@ -2050,7 +2049,7 @@ fbCompositeSolidMask_nx8x0565mmx (pixman_op_t op,
if (srca == 0xff && (m0 & m1 & m2 & m3) == 0xff)
{
- *(unsigned long long *)dst = srcsrcsrcsrc;
+ *(ullong *)dst = srcsrcsrcsrc;
}
else if (m0 | m1 | m2 | m3)
{