Remove all remaining trailing whitespace.

This patch was produced with the following (GNU) sed script:

	sed -i -r -e 's/[ \t]+$//'

run on all *.[ch] files within cairo.

Note that the above script would have also created all the changes
from the previous commits to remove trailing whitespace.

18 files changed, 79 insertions, 79 deletions

diff --git a/pixman/src/fbcompose.c b/pixman/src/fbcompose.c
index f8aa3a3e2..8d20039b0 100644
--- a/pixman/src/fbcompose.c
+++ b/pixman/src/fbcompose.c
@@ -224,7 +224,7 @@ fbFetch_r5g6b5 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedP
     const CARD16 *end = pixel + width;
     while (pixel < end) {
         CARD32  p = *pixel++;
-        CARD32 r = (((p) << 3) & 0xf8) | 
+        CARD32 r = (((p) << 3) & 0xf8) |
                    (((p) << 5) & 0xfc00) |
                    (((p) << 8) & 0xf80000);
         r |= (r >> 5) & 0x70007;
diff --git a/pixman/src/fbmmx.c b/pixman/src/fbmmx.c
index 8ff9f9f63..4b5e5dddd 100644
--- a/pixman/src/fbmmx.c
+++ b/pixman/src/fbmmx.c
@@ -304,7 +304,7 @@ expand565 (__m64 pixel, int pos)
     __m64 t1, t2;
 
     /* move pixel to low 16 bit and zero the rest */
-    p = shift (shift (p, (3 - pos) * 16), -48); 
+    p = shift (shift (p, (3 - pos) * 16), -48);
 
     t1 = shift (p, 36 - 11);
     t2 = shift (p, 16 - 5);
@@ -753,7 +753,7 @@ mmxCombineAtopC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
         __m64 s = load8888(*src);
         __m64 d = load8888(*dest);
         __m64 da = expand_alpha(d);
-        __m64 sa = expand_alpha(s); 
+        __m64 sa = expand_alpha(s);
         s = pix_multiply(s, a);
         a = pix_multiply(a, sa);
         a = negate(a);
@@ -1214,7 +1214,7 @@ fbCompositeSrc_8888x8x8888mmx (pixman_operator_t	op,
 	}
     }
 
-    _mm_empty(); 
+    _mm_empty();
 }
 
 void
@@ -1349,7 +1349,7 @@ fbCompositeSrc_x888x8x8888mmx (pixman_operator_t	op,
 	}
     }
 
-    _mm_empty(); 
+    _mm_empty();
 }
 
 void
diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c
index 2cfbeb88e..3c032c113 100644
--- a/pixman/src/fbpict.c
+++ b/pixman/src/fbpict.c
@@ -1907,7 +1907,7 @@ slim_hidden_def(pixman_composite);
 enum CPUFeatures {
     NoFeatures = 0,
     MMX = 0x1,
-    MMX_Extensions = 0x2, 
+    MMX_Extensions = 0x2,
     SSE = 0x6,
     SSE2 = 0x8,
     CMOV = 0x10
@@ -1952,9 +1952,9 @@ static unsigned int detectCPUFeatures(void) {
 	     "pop %%ebx\n"
              "1:\n"
              "mov %%edx, %0\n"
-             : "=r" (result), 
-               "=m" (vendor[0]), 
-               "=m" (vendor[4]), 
+             : "=r" (result),
+               "=m" (vendor[0]),
+               "=m" (vendor[4]),
                "=m" (vendor[8])
              :
              : "%eax", "%ecx", "%edx"
@@ -1974,7 +1974,7 @@ static unsigned int detectCPUFeatures(void) {
         if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
             /* check for AMD MMX extensions */
 
-            unsigned int result;            
+            unsigned int result;
             __asm__("push %%ebx\n"
                     "mov $0x80000000, %%eax\n"
                     "cpuid\n"
diff --git a/pixman/src/icblt.c b/pixman/src/icblt.c
index cbd33c382..4f0c98e31 100644
--- a/pixman/src/icblt.c
+++ b/pixman/src/icblt.c
@@ -45,7 +45,7 @@ fbBlt (FbBits   *srcLine,
        FbStride dstStride,
        int	dstX,
 
-       int	width, 
+       int	width,
        int	height,
 
        int	alu,
@@ -239,7 +239,7 @@ fbBlt (FbBits   *srcLine,
 		    bits1 = *--src;
 		if (endmask)
 		{
-		    bits = FbScrRight(bits1, rightShift); 
+		    bits = FbScrRight(bits1, rightShift);
 		    if (FbScrRight(endmask, leftShift))
 		    {
 			bits1 = *--src;
@@ -253,7 +253,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrRight(bits1, rightShift); 
+			bits = FbScrRight(bits1, rightShift);
 			bits1 = *--src;
 			bits |= FbScrLeft(bits1, leftShift);
 			--dst;
@@ -264,7 +264,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrRight(bits1, rightShift); 
+			bits = FbScrRight(bits1, rightShift);
 			bits1 = *--src;
 			bits |= FbScrLeft(bits1, leftShift);
 			--dst;
@@ -273,7 +273,7 @@ fbBlt (FbBits   *srcLine,
 		}
 		if (startmask)
 		{
-		    bits = FbScrRight(bits1, rightShift); 
+		    bits = FbScrRight(bits1, rightShift);
 		    if (FbScrRight(startmask, leftShift))
 		    {
 			bits1 = *--src;
@@ -289,7 +289,7 @@ fbBlt (FbBits   *srcLine,
 		    bits1 = *src++;
 		if (startmask)
 		{
-		    bits = FbScrLeft(bits1, leftShift); 
+		    bits = FbScrLeft(bits1, leftShift);
 		    bits1 = *src++;
 		    bits |= FbScrRight(bits1, rightShift);
 		    FbDoLeftMaskByteMergeRop (dst, bits, startbyte, startmask);
@@ -300,7 +300,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrLeft(bits1, leftShift); 
+			bits = FbScrLeft(bits1, leftShift);
 			bits1 = *src++;
 			bits |= FbScrRight(bits1, rightShift);
 			*dst = FbDoDestInvarientMergeRop(bits);
@@ -311,7 +311,7 @@ fbBlt (FbBits   *srcLine,
 		{
 		    while (n--)
 		    {
-			bits = FbScrLeft(bits1, leftShift); 
+			bits = FbScrLeft(bits1, leftShift);
 			bits1 = *src++;
 			bits |= FbScrRight(bits1, rightShift);
 			*dst = FbDoMergeRop(bits, *dst);
@@ -320,7 +320,7 @@ fbBlt (FbBits   *srcLine,
 		}
 		if (endmask)
 		{
-		    bits = FbScrLeft(bits1, leftShift); 
+		    bits = FbScrLeft(bits1, leftShift);
 		    if (FbScrLeft(endmask, rightShift))
 		    {
 			bits1 = *src;
@@ -480,7 +480,7 @@ fbBlt24Line (FbBits	    *src,
 		bits1 = *--src;
 	    if (endmask)
 	    {
-		bits = FbScrRight(bits1, rightShift); 
+		bits = FbScrRight(bits1, rightShift);
 		if (FbScrRight(endmask, leftShift))
 		{
 		    bits1 = *--src;
@@ -492,7 +492,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    while (n--)
 	    {
-		bits = FbScrRight(bits1, rightShift); 
+		bits = FbScrRight(bits1, rightShift);
 		bits1 = *--src;
 		bits |= FbScrLeft(bits1, leftShift);
 		--dst;
@@ -501,7 +501,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    if (startmask)
 	    {
-		bits = FbScrRight(bits1, rightShift); 
+		bits = FbScrRight(bits1, rightShift);
 		if (FbScrRight(startmask, leftShift))
 		{
 		    bits1 = *--src;
@@ -517,7 +517,7 @@ fbBlt24Line (FbBits	    *src,
 		bits1 = *src++;
 	    if (startmask)
 	    {
-		bits = FbScrLeft(bits1, leftShift); 
+		bits = FbScrLeft(bits1, leftShift);
 		bits1 = *src++;
 		bits |= FbScrRight(bits1, rightShift);
 		*dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
@@ -526,7 +526,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    while (n--)
 	    {
-		bits = FbScrLeft(bits1, leftShift); 
+		bits = FbScrLeft(bits1, leftShift);
 		bits1 = *src++;
 		bits |= FbScrRight(bits1, rightShift);
 		*dst = FbDoMaskMergeRop(bits, *dst, mask);
@@ -535,7 +535,7 @@ fbBlt24Line (FbBits	    *src,
 	    }
 	    if (endmask)
 	    {
-		bits = FbScrLeft(bits1, leftShift); 
+		bits = FbScrLeft(bits1, leftShift);
 		if (FbScrLeft(endmask, rightShift))
 		{
 		    bits1 = *src;
@@ -572,7 +572,7 @@ fbBlt24 (FbBits	    *srcLine,
 	 FbStride   dstStride,
 	 int	    dstX,
 
-	 int	    width, 
+	 int	    width,
 	 int	    height,
 
 	 int	    alu,
@@ -880,7 +880,7 @@ fbBltStip (FbStip   *src,
 	   FbStride dstStride,	    /* in FbStip units, not FbBits units */
 	   int	    dstX,
 
-	   int	    width, 
+	   int	    width,
 	   int	    height,
 
 	   int	    alu,
@@ -939,10 +939,10 @@ fbBltStip (FbStip   *src,
     else
 #endif
     {
-	fbBlt ((FbBits *) src, FbStipStrideToBitsStride (srcStride), 
-	       srcX, 
-	       (FbBits *) dst, FbStipStrideToBitsStride (dstStride), 
-	       dstX, 
+	fbBlt ((FbBits *) src, FbStipStrideToBitsStride (srcStride),
+	       srcX,
+	       (FbBits *) dst, FbStipStrideToBitsStride (dstStride),
+	       dstX,
 	       width, height,
 	       alu, pm, bpp, FALSE, FALSE);
     }
diff --git a/pixman/src/icbltone.c b/pixman/src/icbltone.c
index 022d49829..210061aee 100644
--- a/pixman/src/icbltone.c
+++ b/pixman/src/icbltone.c
@@ -111,7 +111,7 @@ static uint8_t const fb8Lane[16] = {
 };
 
 static uint8_t const fb16Lane[16] = {
-    0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 static uint8_t const fb32Lane[16] = {
@@ -209,7 +209,7 @@ fbBltOne (FbStip    *src,
     srcX &= FB_STIP_MASK;
     dstX &= FB_MASK;
 
-    FbMaskBitsBytes(dstX, width, copy, 
+    FbMaskBitsBytes(dstX, width, copy,
 		    startmask, startbyte, nmiddle, endmask, endbyte);
 
     /*
@@ -300,7 +300,7 @@ fbBltOne (FbStip    *src,
 		else
 #endif
 		    mask = fbBits[FbLeftStipBits(bits,pixelsPerDst)];
-#ifndef FBNOPIXADDR		
+#ifndef FBNOPIXADDR
 		if (fbLane)
 		{
 		    fbTransparentSpan (dst, mask & startmask, fgxor, 1);
@@ -407,7 +407,7 @@ fbBltOne (FbStip    *src,
 #endif
 	    {
 		if (mask || !transparent)
-		    FbDoRightMaskByteStippleRRop (dst, mask, 
+		    FbDoRightMaskByteStippleRRop (dst, mask,
 						  fgand, fgxor, bgand, bgxor,
 						  endbyte, endmask);
 	    }
diff --git a/pixman/src/icformat.c b/pixman/src/icformat.c
index 033b65a80..f13328363 100644
--- a/pixman/src/icformat.c
+++ b/pixman/src/icformat.c
@@ -110,7 +110,7 @@ pixman_format_init (pixman_format_t *format, int format_code)
 			     PICT_FORMAT_B(format_code));
 
 	format->redMask = Mask(PICT_FORMAT_R(format_code));
-	format->red = (PICT_FORMAT_G(format_code) + 
+	format->red = (PICT_FORMAT_G(format_code) +
 		       PICT_FORMAT_B(format_code));
 
 	format->greenMask = Mask(PICT_FORMAT_G(format_code));
@@ -129,7 +129,7 @@ pixman_format_init (pixman_format_t *format, int format_code)
 			     PICT_FORMAT_R(format_code));
 
 	format->blueMask = Mask(PICT_FORMAT_B(format_code));
-	format->blue = (PICT_FORMAT_G(format_code) + 
+	format->blue = (PICT_FORMAT_G(format_code) +
 			PICT_FORMAT_R(format_code));
 
 	format->greenMask = Mask(PICT_FORMAT_G(format_code));
diff --git a/pixman/src/icimage.c b/pixman/src/icimage.c
index 5425f6537..a9e92898a 100644
--- a/pixman/src/icimage.c
+++ b/pixman/src/icimage.c
@@ -613,11 +613,11 @@ FbClipImageSrc (pixman_region16_t	*region,
 	if (image->compositeClipSource &&
 	    image->clientClipType != CT_NONE)
 	{
-	    pixman_region_translate (region, 
+	    pixman_region_translate (region,
 			   dx - image->clipOrigin.x,
 			   dy - image->clipOrigin.y);
 	    pixman_region_intersect (region, image->clientClip, region);
-	    pixman_region_translate (region, 
+	    pixman_region_translate (region,
 			   - (dx - image->clipOrigin.x),
 			   - (dy - image->clipOrigin.y));
 	}
@@ -812,7 +812,7 @@ SetPictureClipRects (PicturePtr	pPicture,
 				 nRect, rects, CT_UNSORTED);
     if (!clientClip)
 	return 1;
-    result =(*ps->ChangePictureClip) (pPicture, CT_REGION, 
+    result =(*ps->ChangePictureClip) (pPicture, CT_REGION,
 				      (void *) clientClip, 0);
     if (result == 0)
     {
diff --git a/pixman/src/icimage.h b/pixman/src/icimage.h
index 0d50e1f58..868ed66e6 100644
--- a/pixman/src/icimage.h
+++ b/pixman/src/icimage.h
@@ -35,7 +35,7 @@
 
 /*
 typedef struct _IndexFormat {
-    VisualPtr	    pVisual; 
+    VisualPtr	    pVisual;
     ColormapPtr	    pColormap;
     int		    nvalues;
     xIndexValue	    *pValues;
diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index d45f6328f..e7f1de306 100644
--- a/pixman/src/icint.h
+++ b/pixman/src/icint.h
@@ -590,7 +590,7 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
  * icblt.c
  */
 pixman_private void
-fbBlt (pixman_bits_t   *src, 
+fbBlt (pixman_bits_t   *src,
        FbStride	srcStride,
        int	srcX,
 
@@ -598,7 +598,7 @@ fbBlt (pixman_bits_t   *src,
        FbStride dstStride,
        int	dstX,
 
-       int	width, 
+       int	width,
        int	height,
 
        int	alu,
@@ -617,7 +617,7 @@ fbBlt24 (pixman_bits_t	    *srcLine,
 	 FbStride   dstStride,
 	 int	    dstX,
 
-	 int	    width, 
+	 int	    width,
 	 int	    height,
 
 	 int	    alu,
@@ -635,7 +635,7 @@ fbBltStip (FbStip   *src,
 	   FbStride dstStride,	    /* in FbStip units, not FbBits units */
 	   int	    dstX,
 
-	   int	    width, 
+	   int	    width,
 	   int	    height,
 
 	   int	    alu,
diff --git a/pixman/src/icrect.c b/pixman/src/icrect.c
index 959699a3d..7027d22f7 100644
--- a/pixman/src/icrect.c
+++ b/pixman/src/icrect.c
@@ -123,7 +123,7 @@ pixman_fill_rect_8bpp (pixman_image_t *dst,
 static void
 pixman_fill_rect_32bpp (pixman_image_t *dst,
 			int16_t	        xDst,
-			int16_t	        yDst, 
+			int16_t	        yDst,
 			uint16_t	width,
 			uint16_t	height,
 			pixman_bits_t  *pixel)
@@ -210,11 +210,11 @@ pixman_color_rects (pixman_image_t	 *dst,
     pixman_region_intersect (clip, clip, clipPict->pCompositeClip);
     if (clipPict->alphaMap)
     {
-	pixman_region_translate (clip, 
+	pixman_region_translate (clip,
 				 -clipPict->alphaOrigin.x,
 				 -clipPict->alphaOrigin.y);
 	pixman_region_intersect (clip, clip, clipPict->alphaMap->pCompositeClip);
-	pixman_region_translate (clip, 
+	pixman_region_translate (clip,
 				 clipPict->alphaOrigin.x,
 				 clipPict->alphaOrigin.y);
     }
@@ -248,14 +248,14 @@ pixman_color_rects (pixman_image_t	 *dst,
 	func = pixman_fill_rect_32bpp;
     else if (dst->pixels->bpp == 1)
 	func = pixman_fill_rect_1bpp;
-    else 
+    else
 	func = pixman_fill_rect_general;
 
     for (i = 0; i < n_clipped_rects; i++) {
 	(*func) (dst,
-		 clipped_rects[i].x1, 
-		 clipped_rects[i].y1, 
-		 clipped_rects[i].x2 - clipped_rects[i].x1, 
+		 clipped_rects[i].x1,
+		 clipped_rects[i].y1,
+		 clipped_rects[i].x2 - clipped_rects[i].x1,
 		 clipped_rects[i].y2 - clipped_rects[i].y1,
 		 &pixel);
     }
@@ -350,7 +350,7 @@ pixman_fill_rectangles (pixman_operator_t		op,
 
 	while (nRects--)
 	{
-	    pixman_composite (op, src, NULL, dst, 0, 0, 0, 0, 
+	    pixman_composite (op, src, NULL, dst, 0, 0, 0, 0,
 			 rects->x,
 			 rects->y,
 			 rects->width,
diff --git a/pixman/src/ictransform.c b/pixman/src/ictransform.c
index 6e821610d..c7358bfbb 100644
--- a/pixman/src/ictransform.c
+++ b/pixman/src/ictransform.c
@@ -40,7 +40,7 @@ pixman_transform_point (pixman_transform_t	*transform,
 	v = 0;
 	for (i = 0; i < 3; i++)
 	{
-	    partial = ((xFixed_48_16) transform->matrix[j][i] * 
+	    partial = ((xFixed_48_16) transform->matrix[j][i] *
 		       (xFixed_48_16) vector->vector[i]);
 	    v += partial >> 16;
 	}
diff --git a/pixman/src/ictrap.c b/pixman/src/ictrap.c
index 68b475067..5a33ab828 100644
--- a/pixman/src/ictrap.c
+++ b/pixman/src/ictrap.c
@@ -46,7 +46,7 @@ FbCreateAlphaPicture (pixman_image_t	*dst,
     }
 
     /* pixman_image_create zeroes out the pixels, so we don't have to */
-    image = pixman_image_create (format, width, height); 
+    image = pixman_image_create (format, width, height);
 
     if (own_format)
 	pixman_format_destroy (format);
@@ -174,7 +174,7 @@ pixman_composite_trapezoids (pixman_operator_t	      op,
     {
 	if (!xTrapezoidValid(traps))
 	    continue;
-	fbRasterizeTrapezoid (image, traps, 
+	fbRasterizeTrapezoid (image, traps,
 			      -bounds.x1, -bounds.y1);
     }
 
diff --git a/pixman/src/ictri.c b/pixman/src/ictri.c
index f61296636..d3d5faa38 100644
--- a/pixman/src/ictri.c
+++ b/pixman/src/ictri.c
@@ -252,7 +252,7 @@ pixman_composite_tri_strip (pixman_operator_t		op,
 	    if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
 		continue;
 	    image = FbCreateAlphaPicture (dst,
-					  format, 
+					  format,
 					  bounds.x2 - bounds.x1,
 					  bounds.y2 - bounds.y1);
 	    if (!image)
@@ -332,7 +332,7 @@ pixman_composite_tri_fan (pixman_operator_t		op,
 	    if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
 		continue;
 	    image = FbCreateAlphaPicture (dst,
-					  format, 
+					  format,
 					  bounds.x2 - bounds.x1,
 					  bounds.y2 - bounds.y1);
 	    if (!image)
diff --git a/pixman/src/pixman-xserver-compat.h b/pixman/src/pixman-xserver-compat.h
index 5113abd54..ee2cca594 100644
--- a/pixman/src/pixman-xserver-compat.h
+++ b/pixman/src/pixman-xserver-compat.h
@@ -69,7 +69,7 @@ typedef pixman_triangle_t	xTriangle;
 */
 #define RENDER 1
 /*
-#define FB_SHIFT IC_SHIFT 
+#define FB_SHIFT IC_SHIFT
 #define FB_MASK IC_MASK
 #define FB_ALLONES IC_ALLONES
 #define FbMaskBits IcMaskBits
diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index 00884e7ce..28dc30a16 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -37,13 +37,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c
index 9ecd04a86..a47416158 100644
--- a/pixman/src/pixregion.c
+++ b/pixman/src/pixregion.c
@@ -23,18 +23,18 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 
-Copyright 1987, 1988, 1989 by 
-Digital Equipment Corporation, Maynard, Massachusetts. 
+Copyright 1987, 1988, 1989 by
+Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -451,7 +451,7 @@ pixman_region_copy(pixman_region16_t *dst, pixman_region16_t *src)
 	dst->data->size = src->data->numRects;
     }
     dst->data->numRects = src->data->numRects;
-    memmove((char *)PIXREGION_BOXPTR(dst),(char *)PIXREGION_BOXPTR(src), 
+    memmove((char *)PIXREGION_BOXPTR(dst),(char *)PIXREGION_BOXPTR(src),
 	  dst->data->numRects * sizeof(pixman_box16_t));
     return PIXMAN_REGION_STATUS_SUCCESS;
 }
@@ -1335,7 +1335,7 @@ pixman_region_append(dstrgn, rgn)
 	if (dnumRects == 1)
 	    *new = *PIXREGION_BOXPTR(dstrgn);
 	else
-	    memmove((char *)new,(char *)PIXREGION_BOXPTR(dstrgn), 
+	    memmove((char *)new,(char *)PIXREGION_BOXPTR(dstrgn),
 		  dnumRects * sizeof(pixman_box16_t));
 	new = PIXREGION_BOXPTR(dstrgn);
     }
@@ -1869,9 +1869,9 @@ pixman_region_subtractO (
  */
 pixman_region_status_t
 pixman_region_subtract(regD, regM, regS)
-    pixman_region16_t *	regD;               
+    pixman_region16_t *	regD;
     pixman_region16_t * 	regM;
-    pixman_region16_t *	regS;          
+    pixman_region16_t *	regS;
 {
     int overlap; /* result ignored */
 
@@ -2176,7 +2176,7 @@ pixman_region16_data_copy(pixman_region16_t * dst, pixman_region16_t * src)
 {
     good(dst);
     good(src);
-    if (dst->data) 
+    if (dst->data)
 	return PIXMAN_REGION_STATUS_SUCCESS;
     if (dst == src)
 	return PIXMAN_REGION_STATUS_SUCCESS;
diff --git a/pixman/src/pixregionint.h b/pixman/src/pixregionint.h
index e47c45590..8a902ad4f 100644
--- a/pixman/src/pixregionint.h
+++ b/pixman/src/pixregionint.h
@@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/pixman/src/slim_internal.h b/pixman/src/slim_internal.h
index 24b947a3c..742059c69 100644
--- a/pixman/src/slim_internal.h
+++ b/pixman/src/slim_internal.h
@@ -30,7 +30,7 @@
 /* This macro marks a symbol as STV_HIDDEN, which prevents it from being
    added to the dynamic symbol table of the shared library.  This prevents
    users of the library from knowingly or unknowingly accessing library
-   internals that may change in future releases.  It also allows the 
+   internals that may change in future releases.  It also allows the
    compiler to generate slightly more efficient code in some cases.
 
    The macro should be placed either immediately before the return type in