Delete empty FASTCALL macro

6 files changed, 276 insertions, 277 deletions

diff --git a/pixman/combine.inc b/pixman/combine.inc
index 0d556940..2f4d6a7c 100644
--- a/pixman/combine.inc
+++ b/pixman/combine.inc
@@ -42,14 +42,14 @@ combineMask (const comp4_t *src, const comp4_t *mask, int i)
     return s;
 }
 
-FASTCALL static void
+static void
 fbCombineClear (pixman_implementation_t *imp, pixman_op_t op,
 		comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     memset(dest, 0, width*sizeof(comp4_t));
 }
 
-FASTCALL static void
+static void
 fbCombineSrcU (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -69,7 +69,7 @@ fbCombineSrcU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 /* if the Src is opaque, call fbCombineSrcU */
-FASTCALL static void
+static void
 fbCombineOverU (pixman_implementation_t *imp, pixman_op_t op,
 		comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -85,7 +85,7 @@ fbCombineOverU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 /* if the Dst is opaque, this is a noop */
-FASTCALL static void
+static void
 fbCombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -100,7 +100,7 @@ fbCombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 /* if the Dst is opaque, call fbCombineSrcU */
-FASTCALL static void
+static void
 fbCombineInU (pixman_implementation_t *imp, pixman_op_t op,
 	      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -114,7 +114,7 @@ fbCombineInU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 /* if the Src is opaque, this is a noop */
-FASTCALL static void
+static void
 fbCombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		     comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -129,7 +129,7 @@ fbCombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 /* if the Dst is opaque, call fbCombineClear */
-FASTCALL static void
+static void
 fbCombineOutU (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -143,7 +143,7 @@ fbCombineOutU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 /* if the Src is opaque, call fbCombineClear */
-FASTCALL static void
+static void
 fbCombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -160,7 +160,7 @@ fbCombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
 /* if the Src is opaque, call fbCombineInU */
 /* if the Dst is opaque, call fbCombineOverU */
 /* if both the Src and Dst are opaque, call fbCombineSrcU */
-FASTCALL static void
+static void
 fbCombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
 		comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -179,7 +179,7 @@ fbCombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
 /* if the Src is opaque, call fbCombineOverReverseU */
 /* if the Dst is opaque, call fbCombineInReverseU */
 /* if both the Src and Dst are opaque, call fbCombineDstU */
-FASTCALL static void
+static void
 fbCombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -198,7 +198,7 @@ fbCombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
 /* if the Src is opaque, call fbCombineOverU */
 /* if the Dst is opaque, call fbCombineOverReverseU */
 /* if both the Src and Dst are opaque, call fbCombineClear */
-FASTCALL static void
+static void
 fbCombineXorU (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -214,7 +214,7 @@ fbCombineXorU (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineAddU (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -230,7 +230,7 @@ fbCombineAddU (pixman_implementation_t *imp, pixman_op_t op,
 /* if the Src is opaque, call fbCombineAddU */
 /* if the Dst is opaque, call fbCombineAddU */
 /* if both the Src and Dst are opaque, call fbCombineAddU */
-FASTCALL static void
+static void
 fbCombineSaturateU (pixman_implementation_t *imp, pixman_op_t op,
 		    comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -293,7 +293,7 @@ fbCombineSaturateU (pixman_implementation_t *imp, pixman_op_t op,
 #define CombineXor	(CombineAOut|CombineBOut)
 
 /* portion covered by a but not b */
-FASTCALL static comp1_t
+static comp1_t
 fbCombineDisjointOutPart (comp1_t a, comp1_t b)
 {
     /* min (1, (1-b) / a) */
@@ -305,7 +305,7 @@ fbCombineDisjointOutPart (comp1_t a, comp1_t b)
 }
 
 /* portion covered by both a and b */
-FASTCALL static comp1_t
+static comp1_t
 fbCombineDisjointInPart (comp1_t a, comp1_t b)
 {
     /* max (1-(1-b)/a,0) */
@@ -319,7 +319,7 @@ fbCombineDisjointInPart (comp1_t a, comp1_t b)
 }
 
 /* portion covered by a but not b */
-FASTCALL static comp1_t
+static comp1_t
 fbCombineConjointOutPart (comp1_t a, comp1_t b)
 {
     /* max (1-b/a,0) */
@@ -333,7 +333,7 @@ fbCombineConjointOutPart (comp1_t a, comp1_t b)
 }
 
 /* portion covered by both a and b */
-FASTCALL static comp1_t
+static comp1_t
 fbCombineConjointInPart (comp1_t a, comp1_t b)
 {
     /* min (1,b/a) */
@@ -343,7 +343,7 @@ fbCombineConjointInPart (comp1_t a, comp1_t b)
     return IntDiv(b,a);     /* b/a */
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointGeneralU (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width, comp1_t combine)
 {
     int i;
@@ -393,7 +393,7 @@ fbCombineDisjointGeneralU (comp4_t *dest, const comp4_t *src, const comp4_t *mas
     }
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointOverU (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -416,56 +416,56 @@ fbCombineDisjointOverU (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointInU (pixman_implementation_t *imp, pixman_op_t op,
 		      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralU (dest, src, mask, width, CombineAIn);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointInReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			     comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralU (dest, src, mask, width, CombineBIn);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointOutU (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralU (dest, src, mask, width, CombineAOut);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralU (dest, src, mask, width, CombineBOut);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointAtopU (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralU (dest, src, mask, width, CombineAAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralU (dest, src, mask, width, CombineBAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointXorU (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralU (dest, src, mask, width, CombineXor);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointGeneralU (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width, comp1_t combine)
 {
     int i;
@@ -515,7 +515,7 @@ fbCombineConjointGeneralU (comp4_t *dest, const comp4_t *src, const comp4_t *mas
     }
 }
 
-FASTCALL static void
+static void
 fbCombineConjointOverU (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -523,7 +523,7 @@ fbCombineConjointOverU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 
-FASTCALL static void
+static void
 fbCombineConjointOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -531,7 +531,7 @@ fbCombineConjointOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 
-FASTCALL static void
+static void
 fbCombineConjointInU (pixman_implementation_t *imp, pixman_op_t op,
 		      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -539,42 +539,42 @@ fbCombineConjointInU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 
-FASTCALL static void
+static void
 fbCombineConjointInReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			     comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralU (dest, src, mask, width, CombineBIn);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointOutU (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralU (dest, src, mask, width, CombineAOut);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralU (dest, src, mask, width, CombineBOut);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointAtopU (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralU (dest, src, mask, width, CombineAAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralU (dest, src, mask, width, CombineBAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointXorU (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -585,7 +585,7 @@ fbCombineConjointXorU (pixman_implementation_t *imp, pixman_op_t op,
 /*************************** Per Channel functions ******************************/
 /********************************************************************************/
 
-FASTCALL static void
+static void
 fbCombineMaskC (comp4_t *src, comp4_t *mask)
 {
     comp4_t a = *mask;
@@ -616,7 +616,7 @@ fbCombineMaskC (comp4_t *src, comp4_t *mask)
     *(mask) = a;
 }
 
-FASTCALL static void
+static void
 fbCombineMaskValueC (comp4_t *src, const comp4_t *mask)
 {
     comp4_t a = *mask;
@@ -636,7 +636,7 @@ fbCombineMaskValueC (comp4_t *src, const comp4_t *mask)
     *(src) =x;
 }
 
-FASTCALL static void
+static void
 fbCombineMaskAlphaC (const comp4_t *src, comp4_t *mask)
 {
     comp4_t a = *(mask);
@@ -661,14 +661,14 @@ fbCombineMaskAlphaC (const comp4_t *src, comp4_t *mask)
     *(mask) = a;
 }
 
-FASTCALL static void
+static void
 fbCombineClearC (pixman_implementation_t *imp, pixman_op_t op,
 		 comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     memset(dest, 0, width*sizeof(comp4_t));
 }
 
-FASTCALL static void
+static void
 fbCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -684,7 +684,7 @@ fbCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
 		comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -711,7 +711,7 @@ fbCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -737,7 +737,7 @@ fbCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineInC (pixman_implementation_t *imp, pixman_op_t op,
 	      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -762,7 +762,7 @@ fbCombineInC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		     comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -789,7 +789,7 @@ fbCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -815,7 +815,7 @@ fbCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -842,7 +842,7 @@ fbCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
 		comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -864,7 +864,7 @@ fbCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -887,7 +887,7 @@ fbCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -909,7 +909,7 @@ fbCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineAddC (pixman_implementation_t *imp, pixman_op_t op,
 	       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -927,7 +927,7 @@ fbCombineAddC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineSaturateC (pixman_implementation_t *imp, pixman_op_t op,
 		    comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
@@ -975,7 +975,7 @@ fbCombineSaturateC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointGeneralC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width, comp1_t combine)
 {
     int i;
@@ -1051,63 +1051,63 @@ fbCombineDisjointGeneralC (comp4_t *dest, const comp4_t *src, const comp4_t *mas
     }
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointOverC (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineAOver);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointInC (pixman_implementation_t *imp, pixman_op_t op,
 		      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineAIn);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointInReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			     comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineBIn);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointOutC (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineAOut);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineBOut);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointAtopC (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineAAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineBAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineDisjointXorC (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineDisjointGeneralC (dest, src, mask, width, CombineXor);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointGeneralC (comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width, comp1_t combine)
 {
     int i;
@@ -1183,63 +1183,63 @@ fbCombineConjointGeneralC (comp4_t *dest, const comp4_t *src, const comp4_t *mas
     }
 }
 
-FASTCALL static void
+static void
 fbCombineConjointOverC (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineAOver);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineBOver);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointInC (pixman_implementation_t *imp, pixman_op_t op,
 		      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineAIn);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointInReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			     comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineBIn);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointOutC (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineAOut);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			      comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineBOut);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointAtopC (pixman_implementation_t *imp, pixman_op_t op,
 			comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineAAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
     fbCombineConjointGeneralC (dest, src, mask, width, CombineBAtop);
 }
 
-FASTCALL static void
+static void
 fbCombineConjointXorC (pixman_implementation_t *imp, pixman_op_t op,
 		       comp4_t *dest, const comp4_t *src, const comp4_t *mask, int width)
 {
diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
index 3704c733..269fad0c 100644
--- a/pixman/pixman-access.c
+++ b/pixman/pixman-access.c
@@ -70,7 +70,7 @@
 
 /*********************************** Fetch ************************************/
 
-static FASTCALL void
+static void
 fbFetch_a8r8g8b8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -79,7 +79,7 @@ fbFetch_a8r8g8b8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 		   width*sizeof(uint32_t));
 }
 
-static FASTCALL void
+static void
 fbFetch_x8r8g8b8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -90,7 +90,7 @@ fbFetch_x8r8g8b8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a8b8g8r8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -104,7 +104,7 @@ fbFetch_a8b8g8r8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_x8b8g8r8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -119,7 +119,7 @@ fbFetch_x8b8g8r8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_b8g8r8a8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -134,7 +134,7 @@ fbFetch_b8g8r8a8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_b8g8r8x8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -149,7 +149,7 @@ fbFetch_b8g8r8x8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a2b10g10r10 (bits_image_t *pict, int x, int y, int width, uint64_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -175,7 +175,7 @@ fbFetch_a2b10g10r10 (bits_image_t *pict, int x, int y, int width, uint64_t *buff
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_x2b10g10r10 (bits_image_t *pict, int x, int y, int width, uint64_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -195,7 +195,7 @@ fbFetch_x2b10g10r10 (bits_image_t *pict, int x, int y, int width, uint64_t *buff
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_r8g8b8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -208,7 +208,7 @@ fbFetch_r8g8b8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_b8g8r8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -229,7 +229,7 @@ fbFetch_b8g8r8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_r5g6b5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -246,7 +246,7 @@ fbFetch_r5g6b5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_b5g6r5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -262,7 +262,7 @@ fbFetch_b5g6r5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a1r5g5b5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b, a;
@@ -280,7 +280,7 @@ fbFetch_a1r5g5b5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_x1r5g5b5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -297,7 +297,7 @@ fbFetch_x1r5g5b5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a1b5g5r5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b, a;
@@ -315,7 +315,7 @@ fbFetch_a1b5g5r5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_x1b5g5r5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -332,7 +332,7 @@ fbFetch_x1b5g5r5 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a4r4g4b4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b, a;
@@ -350,7 +350,7 @@ fbFetch_a4r4g4b4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_x4r4g4b4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -367,7 +367,7 @@ fbFetch_x4r4g4b4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a4b4g4r4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b, a;
@@ -385,7 +385,7 @@ fbFetch_a4b4g4r4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_x4b4g4r4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -402,7 +402,7 @@ fbFetch_x4b4g4r4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -413,7 +413,7 @@ fbFetch_a8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_r3g3b2 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -433,7 +433,7 @@ fbFetch_r3g3b2 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_b2g3r3 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -455,7 +455,7 @@ fbFetch_b2g3r3 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a2r2g2b2 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t   a,r,g,b;
@@ -473,7 +473,7 @@ fbFetch_a2r2g2b2 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a2b2g2r2 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t   a,r,g,b;
@@ -491,7 +491,7 @@ fbFetch_a2b2g2r2 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_c8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -504,7 +504,7 @@ fbFetch_c8 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_x4a4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -523,7 +523,7 @@ fbFetch_x4a4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 #define Fetch4(img,l,o)    ((o) & 2 ? Fetch8(img,l,o) >> 4 : Fetch8(img,l,o) & 0xf)
 #endif
 
-static FASTCALL void
+static void
 fbFetch_a4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -536,7 +536,7 @@ fbFetch_a4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_r1g2b1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -552,7 +552,7 @@ fbFetch_r1g2b1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_b1g2r1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  r,g,b;
@@ -568,7 +568,7 @@ fbFetch_b1g2r1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a1r1g1b1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  a,r,g,b;
@@ -585,7 +585,7 @@ fbFetch_a1r1g1b1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_a1b1g1r1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     uint32_t  a,r,g,b;
@@ -602,7 +602,7 @@ fbFetch_a1b1g1r1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_c4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -616,7 +616,7 @@ fbFetch_c4 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 }
 
 
-static FASTCALL void
+static void
 fbFetch_a1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -637,7 +637,7 @@ fbFetch_a1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_g1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
 {
     const uint32_t *bits = pict->bits + y*pict->rowstride;
@@ -656,7 +656,7 @@ fbFetch_g1 (bits_image_t *pict, int x, int y, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_yuy2 (bits_image_t *pict, int x, int line, int width, uint32_t *buffer)
 {
     int16_t y, u, v;
@@ -685,7 +685,7 @@ fbFetch_yuy2 (bits_image_t *pict, int x, int line, int width, uint32_t *buffer)
     }
 }
 
-static FASTCALL void
+static void
 fbFetch_yv12 (bits_image_t *pict, int x, int line, int width, uint32_t *buffer)
 {
     YV12_SETUP(pict);
@@ -777,7 +777,7 @@ fetchProc32 ACCESS(pixman_fetchProcForPicture32) (bits_image_t * pict)
     return NULL;
 }
 
-static FASTCALL void
+static void
 fbFetch64_generic (bits_image_t *pict, int x, int y, int width, uint64_t *buffer)
 {
     fetchProc32 fetch32 = ACCESS(pixman_fetchProcForPicture32) (pict);
@@ -799,7 +799,7 @@ fetchProc64 ACCESS(pixman_fetchProcForPicture64) (bits_image_t * pict)
 
 /**************************** Pixel wise fetching *****************************/
 
-static FASTCALL void
+static void
 fbFetchPixel_a2b10g10r10 (bits_image_t *pict, uint64_t *buffer, int n_pixels)
 {
     int i;
@@ -836,7 +836,7 @@ fbFetchPixel_a2b10g10r10 (bits_image_t *pict, uint64_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x2b10g10r10 (bits_image_t *pict, uint64_t *buffer, int n_pixels)
 {
     int i;
@@ -867,7 +867,7 @@ fbFetchPixel_x2b10g10r10 (bits_image_t *pict, uint64_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a8r8g8b8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -889,7 +889,7 @@ fbFetchPixel_a8r8g8b8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x8r8g8b8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -911,7 +911,7 @@ fbFetchPixel_x8r8g8b8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a8b8g8r8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -938,7 +938,7 @@ fbFetchPixel_a8b8g8r8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x8b8g8r8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -965,7 +965,7 @@ fbFetchPixel_x8b8g8r8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_b8g8r8a8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -992,7 +992,7 @@ fbFetchPixel_b8g8r8a8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_b8g8r8x8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1019,7 +1019,7 @@ fbFetchPixel_b8g8r8x8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_r8g8b8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1052,7 +1052,7 @@ fbFetchPixel_r8g8b8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_b8g8r8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1085,7 +1085,7 @@ fbFetchPixel_b8g8r8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_r5g6b5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1113,7 +1113,7 @@ fbFetchPixel_r5g6b5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_b5g6r5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1141,7 +1141,7 @@ fbFetchPixel_b5g6r5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a1r5g5b5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1170,7 +1170,7 @@ fbFetchPixel_a1r5g5b5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x1r5g5b5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1198,7 +1198,7 @@ fbFetchPixel_x1r5g5b5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a1b5g5r5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1227,7 +1227,7 @@ fbFetchPixel_a1b5g5r5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x1b5g5r5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1255,7 +1255,7 @@ fbFetchPixel_x1b5g5r5 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a4r4g4b4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1284,7 +1284,7 @@ fbFetchPixel_a4r4g4b4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x4r4g4b4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1312,7 +1312,7 @@ fbFetchPixel_x4r4g4b4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a4b4g4r4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1341,7 +1341,7 @@ fbFetchPixel_a4b4g4r4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x4b4g4r4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1369,7 +1369,7 @@ fbFetchPixel_x4b4g4r4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1393,7 +1393,7 @@ fbFetchPixel_a8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_r3g3b2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1424,7 +1424,7 @@ fbFetchPixel_r3g3b2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_b2g3r3 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1457,7 +1457,7 @@ fbFetchPixel_b2g3r3 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a2r2g2b2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1486,7 +1486,7 @@ fbFetchPixel_a2r2g2b2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a2b2g2r2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1515,7 +1515,7 @@ fbFetchPixel_a2b2g2r2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_c8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1539,7 +1539,7 @@ fbFetchPixel_c8 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_x4a4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1563,7 +1563,7 @@ fbFetchPixel_x4a4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1588,7 +1588,7 @@ fbFetchPixel_a4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_r1g2b1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1616,7 +1616,7 @@ fbFetchPixel_r1g2b1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_b1g2r1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1644,7 +1644,7 @@ fbFetchPixel_b1g2r1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a1r1g1b1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1673,7 +1673,7 @@ fbFetchPixel_a1r1g1b1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_a1b1g1r1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1702,7 +1702,7 @@ fbFetchPixel_a1b1g1r1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_c4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1728,7 +1728,7 @@ fbFetchPixel_c4 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 }
 
 
-static FASTCALL void
+static void
 fbFetchPixel_a1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1761,7 +1761,7 @@ fbFetchPixel_a1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_g1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1792,7 +1792,7 @@ fbFetchPixel_g1 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_yuy2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1832,7 +1832,7 @@ fbFetchPixel_yuy2 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
     }
 }
 
-static FASTCALL void
+static void
 fbFetchPixel_yv12 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     int i;
@@ -1875,7 +1875,7 @@ fbFetchPixel_yv12 (bits_image_t *pict, uint32_t *buffer, int n_pixels)
  *
  * WARNING: This function loses precision!
  */
-static FASTCALL void
+static void
 fbFetchPixel32_generic_lossy (bits_image_t *pict, uint32_t *buffer, int n_pixels)
 {
     fetch_pixels_64_t fetch_pixels_64 = ACCESS(pixman_fetchPixelProcForPicture64) (pict);
@@ -1950,7 +1950,7 @@ ACCESS(pixman_fetchPixelProcForPicture32) (bits_image_t * pict)
     return NULL;
 }
 
-static FASTCALL void
+static void
 fbFetchPixel64_generic (bits_image_t *pict, uint64_t *buffer, int n_pixels)
 {
     fetch_pixels_32_t fetch_pixels_32 = ACCESS(pixman_fetchPixelProcForPicture32) (pict);
@@ -1975,7 +1975,7 @@ ACCESS(pixman_fetchPixelProcForPicture64) (bits_image_t * pict)
 #define Splita(v)	uint32_t	a = ((v) >> 24), r = ((v) >> 16) & 0xff, g = ((v) >> 8) & 0xff, b = (v) & 0xff
 #define Split(v)	uint32_t	r = ((v) >> 16) & 0xff, g = ((v) >> 8) & 0xff, b = (v) & 0xff
 
-static FASTCALL void
+static void
 fbStore_a2b10g10r10 (pixman_image_t *image,
 		     uint32_t *bits, const uint64_t *values,
 		     int x, int width, const pixman_indexed_t * indexed)
@@ -1991,7 +1991,7 @@ fbStore_a2b10g10r10 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_x2b10g10r10 (pixman_image_t *image,
 		     uint32_t *bits, const uint64_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2005,14 +2005,14 @@ fbStore_x2b10g10r10 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a8r8g8b8 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
     MEMCPY_WRAPPED(image, ((uint32_t *)bits) + x, values, width*sizeof(uint32_t));
 }
 
-static FASTCALL void
+static void
 fbStore_x8r8g8b8 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2022,7 +2022,7 @@ fbStore_x8r8g8b8 (pixman_image_t *image,
 	WRITE(image, pixel++, values[i] & 0xffffff);
 }
 
-static FASTCALL void
+static void
 fbStore_a8b8g8r8 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2032,7 +2032,7 @@ fbStore_a8b8g8r8 (pixman_image_t *image,
 	WRITE(image, pixel++, (values[i] & 0xff00ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16));
 }
 
-static FASTCALL void
+static void
 fbStore_x8b8g8r8 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2042,7 +2042,7 @@ fbStore_x8b8g8r8 (pixman_image_t *image,
 	WRITE(image, pixel++, (values[i] & 0x0000ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16));
 }
 
-static FASTCALL void
+static void
 fbStore_b8g8r8a8 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2056,7 +2056,7 @@ fbStore_b8g8r8a8 (pixman_image_t *image,
 	    ((values[i] << 24) & 0xff000000));
 }
 
-static FASTCALL void
+static void
 fbStore_b8g8r8x8 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2069,7 +2069,7 @@ fbStore_b8g8r8x8 (pixman_image_t *image,
 	    ((values[i] << 24) & 0xff000000));
 }
 
-static FASTCALL void
+static void
 fbStore_r8g8b8 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width,
 		const pixman_indexed_t * indexed)
@@ -2082,7 +2082,7 @@ fbStore_r8g8b8 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_b8g8r8 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2102,7 +2102,7 @@ fbStore_b8g8r8 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_r5g6b5 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2116,7 +2116,7 @@ fbStore_r5g6b5 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_b5g6r5 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2130,7 +2130,7 @@ fbStore_b5g6r5 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a1r5g5b5 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2145,7 +2145,7 @@ fbStore_a1r5g5b5 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_x1r5g5b5 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2159,7 +2159,7 @@ fbStore_x1r5g5b5 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a1b5g5r5 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2174,7 +2174,7 @@ fbStore_a1b5g5r5 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_x1b5g5r5 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2188,7 +2188,7 @@ fbStore_x1b5g5r5 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a4r4g4b4 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2203,7 +2203,7 @@ fbStore_a4r4g4b4 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_x4r4g4b4 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2217,7 +2217,7 @@ fbStore_x4r4g4b4 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a4b4g4r4 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2232,7 +2232,7 @@ fbStore_a4b4g4r4 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_x4b4g4r4 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2246,7 +2246,7 @@ fbStore_x4b4g4r4 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a8 (pixman_image_t *image,
 	    uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2257,7 +2257,7 @@ fbStore_a8 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_r3g3b2 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2272,7 +2272,7 @@ fbStore_r3g3b2 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_b2g3r3 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2287,7 +2287,7 @@ fbStore_b2g3r3 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a2r2g2b2 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2302,7 +2302,7 @@ fbStore_a2r2g2b2 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_c8 (pixman_image_t *image,
 	    uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2313,7 +2313,7 @@ fbStore_c8 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_x4a4 (pixman_image_t *image,
 	      uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2335,7 +2335,7 @@ fbStore_x4a4 (pixman_image_t *image,
 				   (Fetch8(img,l,o) & 0xf0) | (v)))
 #endif
 
-static FASTCALL void
+static void
 fbStore_a4 (pixman_image_t *image,
 	    uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2345,7 +2345,7 @@ fbStore_a4 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_r1g2b1 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2361,7 +2361,7 @@ fbStore_r1g2b1 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_b1g2r1 (pixman_image_t *image,
 		uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2377,7 +2377,7 @@ fbStore_b1g2r1 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a1r1g1b1 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2393,7 +2393,7 @@ fbStore_a1r1g1b1 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a1b1g1r1 (pixman_image_t *image,
 		  uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2409,7 +2409,7 @@ fbStore_a1b1g1r1 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_c4 (pixman_image_t *image,
 	    uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2422,7 +2422,7 @@ fbStore_c4 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_a1 (pixman_image_t *image,
 	    uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2436,7 +2436,7 @@ fbStore_a1 (pixman_image_t *image,
     }
 }
 
-static FASTCALL void
+static void
 fbStore_g1 (pixman_image_t *image,
 	    uint32_t *bits, const uint32_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
@@ -2508,7 +2508,7 @@ storeProc32 ACCESS(pixman_storeProcForPicture32) (bits_image_t * pict)
  * Contracts a 64bpp image to 32bpp and then stores it using a regular 32-bit
  * store proc.
  */
-static FASTCALL void
+static void
 fbStore64_generic (pixman_image_t *image,
 		   uint32_t *bits, const uint64_t *values, int x, int width, const pixman_indexed_t * indexed)
 {
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 26275d6f..293f4258 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -435,7 +435,7 @@ combine (const uint32_t *src, const uint32_t *mask)
     return ssrc;
 }
 
-static FASTCALL void
+static void
 mmxCombineOverU (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -460,7 +460,7 @@ mmxCombineOverU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -480,7 +480,7 @@ mmxCombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineInU (pixman_implementation_t *imp, pixman_op_t op,
 	       uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -501,7 +501,7 @@ mmxCombineInU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		      uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -522,7 +522,7 @@ mmxCombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineOutU (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -544,7 +544,7 @@ mmxCombineOutU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		       uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -566,7 +566,7 @@ mmxCombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -589,7 +589,7 @@ mmxCombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -614,7 +614,7 @@ mmxCombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineXorU (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -638,7 +638,7 @@ mmxCombineXorU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineAddU (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -657,7 +657,7 @@ mmxCombineAddU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineSaturateU (pixman_implementation_t *imp, pixman_op_t op,
 		     uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -686,7 +686,7 @@ mmxCombineSaturateU (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 
-static FASTCALL void
+static void
 mmxCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -703,7 +703,7 @@ mmxCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -723,7 +723,7 @@ mmxCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -744,7 +744,7 @@ mmxCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
 }
 
 
-static FASTCALL void
+static void
 mmxCombineInC (pixman_implementation_t *imp, pixman_op_t op,
 	       uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -764,7 +764,7 @@ mmxCombineInC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		      uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -784,7 +784,7 @@ mmxCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -805,7 +805,7 @@ mmxCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		       uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -826,7 +826,7 @@ mmxCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -849,7 +849,7 @@ mmxCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -872,7 +872,7 @@ mmxCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -896,7 +896,7 @@ mmxCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 mmxCombineAddC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index e6933da4..e8916924 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -152,20 +152,19 @@ typedef struct point point_t;
 /* FIXME - the types and structures below should be give proper names
  */
 
-#define FASTCALL
-typedef FASTCALL void (*CombineFunc32) (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width);
-typedef FASTCALL void (*fetchProc32)(bits_image_t *pict, int x, int y, int width,
+typedef void (*CombineFunc32) (uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width);
+typedef void (*fetchProc32)(bits_image_t *pict, int x, int y, int width,
                                      uint32_t *buffer);
-typedef FASTCALL uint32_t (*fetchPixelProc32)(bits_image_t *pict, int offset, int line);
-typedef FASTCALL void (*storeProc32)(pixman_image_t *, uint32_t *bits,
+typedef uint32_t (*fetchPixelProc32)(bits_image_t *pict, int offset, int line);
+typedef void (*storeProc32)(pixman_image_t *, uint32_t *bits,
                                      const uint32_t *values, int x, int width,
                                      const pixman_indexed_t *);
 
-typedef FASTCALL void (*CombineFunc64) (uint64_t *dest, const uint64_t *src, const uint64_t *mask, int width);
-typedef FASTCALL void (*fetchProc64)(bits_image_t *pict, int x, int y, int width,
+typedef void (*CombineFunc64) (uint64_t *dest, const uint64_t *src, const uint64_t *mask, int width);
+typedef void (*fetchProc64)(bits_image_t *pict, int x, int y, int width,
                                      uint64_t *buffer);
-typedef FASTCALL uint64_t (*fetchPixelProc64)(bits_image_t *pict, int offset, int line);
-typedef FASTCALL void (*storeProc64)(pixman_image_t *, uint32_t *bits,
+typedef uint64_t (*fetchPixelProc64)(bits_image_t *pict, int offset, int line);
+typedef void (*storeProc64)(pixman_image_t *, uint32_t *bits,
                                      const uint64_t *values, int x, int width,
                                      const pixman_indexed_t *);
 
diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 8b48b2e0..47174d4b 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -2315,7 +2315,7 @@ createMask_2x32_128 (uint32_t mask0, uint32_t mask1)
 
 /* SSE2 code patch for fbcompose.c */
 
-static FASTCALL void
+static void
 sse2CombineOverU (pixman_implementation_t *imp, pixman_op_t op,
 		  uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2323,7 +2323,7 @@ sse2CombineOverU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2331,7 +2331,7 @@ sse2CombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineInU (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2339,7 +2339,7 @@ sse2CombineInU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		       uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2347,7 +2347,7 @@ sse2CombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineOutU (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2355,7 +2355,7 @@ sse2CombineOutU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2363,7 +2363,7 @@ sse2CombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
 		  uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2371,7 +2371,7 @@ sse2CombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2379,7 +2379,7 @@ sse2CombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineXorU (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2387,7 +2387,7 @@ sse2CombineXorU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineAddU (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2395,7 +2395,7 @@ sse2CombineAddU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineSaturateU (pixman_implementation_t *imp, pixman_op_t op,
 		      uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2403,7 +2403,7 @@ sse2CombineSaturateU (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2411,7 +2411,7 @@ sse2CombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineOverC (pixman_implementation_t *imp, pixman_op_t op,
 		  uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2419,7 +2419,7 @@ sse2CombineOverC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2427,7 +2427,7 @@ sse2CombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineInC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2435,7 +2435,7 @@ sse2CombineInC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		       uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2443,7 +2443,7 @@ sse2CombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineOutC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2451,7 +2451,7 @@ sse2CombineOutC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2459,7 +2459,7 @@ sse2CombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
 		  uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2467,7 +2467,7 @@ sse2CombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2475,7 +2475,7 @@ sse2CombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineXorC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -2483,7 +2483,7 @@ sse2CombineXorC (pixman_implementation_t *imp, pixman_op_t op,
     _mm_empty();
 }
 
-static FASTCALL void
+static void
 sse2CombineAddC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dst, const uint32_t *src, const uint32_t *mask, int width)
 {
diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c
index ea4821d8..96d54884 100644
--- a/pixman/pixman-vmx.c
+++ b/pixman/pixman-vmx.c
@@ -216,7 +216,7 @@ over (vector unsigned int src, vector unsigned int srca,
         vec_st ((vector unsigned int) tmp3, 15, dest ); \
         vec_st ((vector unsigned int) tmp1, 0, dest );
 
-static FASTCALL void
+static void
 vmxCombineOverUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -249,7 +249,7 @@ vmxCombineOverUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOverUmask (uint32_t *dest,
                      const uint32_t *src,
                      const uint32_t *mask,
@@ -291,7 +291,7 @@ vmxCombineOverUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOverU(pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask,
                 int width)
@@ -302,7 +302,7 @@ vmxCombineOverU(pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineOverUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineOverReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -335,7 +335,7 @@ vmxCombineOverReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOverReverseUmask (uint32_t *dest,
                             const uint32_t *src,
                             const uint32_t *mask,
@@ -375,7 +375,7 @@ vmxCombineOverReverseUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest, const uint32_t *src,
                         const uint32_t *mask, int width)
@@ -386,7 +386,7 @@ vmxCombineOverReverseU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineOverReverseUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineInUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -418,7 +418,7 @@ vmxCombineInUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineInUmask (uint32_t *dest,
                    const uint32_t *src,
                    const uint32_t *mask,
@@ -457,7 +457,7 @@ vmxCombineInUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineInU (pixman_implementation_t *imp, pixman_op_t op,
 	       uint32_t *dest, const uint32_t *src, const uint32_t *mask,
                int width)
@@ -468,7 +468,7 @@ vmxCombineInU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineInUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineInReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -499,7 +499,7 @@ vmxCombineInReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineInReverseUmask (uint32_t *dest,
                           const uint32_t *src,
                           const uint32_t *mask,
@@ -539,7 +539,7 @@ vmxCombineInReverseUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		      uint32_t *dest, const uint32_t *src,
                       const uint32_t *mask, int width)
@@ -550,7 +550,7 @@ vmxCombineInReverseU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineInReverseUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineOutUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -581,7 +581,7 @@ vmxCombineOutUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOutUmask (uint32_t *dest,
                     const uint32_t *src,
                     const uint32_t *mask,
@@ -620,7 +620,7 @@ vmxCombineOutUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOutU (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask,
                 int width)
@@ -631,7 +631,7 @@ vmxCombineOutU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineOutUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineOutReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -662,7 +662,7 @@ vmxCombineOutReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOutReverseUmask (uint32_t *dest,
                            const uint32_t *src,
                            const uint32_t *mask,
@@ -702,7 +702,7 @@ vmxCombineOutReverseUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
 		       uint32_t *dest,
                        const uint32_t *src,
@@ -715,7 +715,7 @@ vmxCombineOutReverseU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineOutReverseUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -750,7 +750,7 @@ vmxCombineAtopUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopUmask (uint32_t *dest,
                      const uint32_t *src,
                      const uint32_t *mask,
@@ -794,7 +794,7 @@ vmxCombineAtopUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dest,
                  const uint32_t *src,
@@ -807,7 +807,7 @@ vmxCombineAtopU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineAtopUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -842,7 +842,7 @@ vmxCombineAtopReverseUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopReverseUmask (uint32_t *dest,
                             const uint32_t *src,
                             const uint32_t *mask,
@@ -886,7 +886,7 @@ vmxCombineAtopReverseUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest,
                         const uint32_t *src,
@@ -899,7 +899,7 @@ vmxCombineAtopReverseU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineAtopReverseUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineXorUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -934,7 +934,7 @@ vmxCombineXorUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineXorUmask (uint32_t *dest,
                     const uint32_t *src,
                     const uint32_t *mask,
@@ -978,7 +978,7 @@ vmxCombineXorUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineXorU (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest,
                 const uint32_t *src,
@@ -991,7 +991,7 @@ vmxCombineXorU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineXorUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineAddUnomask (uint32_t *dest, const uint32_t *src, int width)
 {
     int i;
@@ -1021,7 +1021,7 @@ vmxCombineAddUnomask (uint32_t *dest, const uint32_t *src, int width)
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAddUmask (uint32_t *dest,
                     const uint32_t *src,
                     const uint32_t *mask,
@@ -1060,7 +1060,7 @@ vmxCombineAddUmask (uint32_t *dest,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAddU (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest,
                 const uint32_t *src,
@@ -1073,7 +1073,7 @@ vmxCombineAddU (pixman_implementation_t *imp, pixman_op_t op,
         vmxCombineAddUnomask(dest, src, width);
 }
 
-static FASTCALL void
+static void
 vmxCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1105,7 +1105,7 @@ vmxCombineSrcC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1139,7 +1139,7 @@ vmxCombineOverC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1174,7 +1174,7 @@ vmxCombineOverReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineInC (pixman_implementation_t *imp, pixman_op_t op,
 	       uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1209,7 +1209,7 @@ vmxCombineInC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		      uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1244,7 +1244,7 @@ vmxCombineInReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1280,7 +1280,7 @@ vmxCombineOutC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
 		       uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1317,7 +1317,7 @@ vmxCombineOutReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
 		 uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1359,7 +1359,7 @@ vmxCombineAtopC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
 			uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1401,7 +1401,7 @@ vmxCombineAtopReverseC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {
@@ -1443,7 +1443,7 @@ vmxCombineXorC (pixman_implementation_t *imp, pixman_op_t op,
     }
 }
 
-static FASTCALL void
+static void
 vmxCombineAddC (pixman_implementation_t *imp, pixman_op_t op,
 		uint32_t *dest, const uint32_t *src, const uint32_t *mask, int width)
 {