--- cairo-1.3.6/pixman/src/icint.h-orig	2007-02-28 14:55:21.572228000 +0800
+++ cairo-1.3.6/pixman/src/icint.h	2007-02-28 15:07:17.934240000 +0800
@@ -39,6 +39,8 @@
 
 #if defined(__GNUC__)
 #define INLINE __inline__
+#elif defined (__SUNPRO_C)
+#define INLINE inline
 #else
 #define INLINE
 #endif
--- cairo-1.3.6/pixman/src/fbpict.h-orig	2007-02-28 14:17:59.784558000 +0800
+++ cairo-1.3.6/pixman/src/fbpict.h	2007-02-28 15:37:19.677213000 +0800
@@ -327,12 +327,6 @@
 #define FASTCALL
 #endif
 
-#if defined(__GNUC__)
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-
 typedef struct _FbComposeData {
     CARD8	op;
     PicturePtr	src;
--- cairo-1.3.6/pixman/src/icimage.c-orig	2007-02-28 14:57:01.873689000 +0800
+++ cairo-1.3.6/pixman/src/icimage.c	2007-02-28 14:57:10.292858000 +0800
@@ -558,7 +558,7 @@ pixman_image_set_clip_region (pixman_ima
 
 #define BOUND(v)	(int16_t) ((v) < MINSHORT ? MINSHORT : (v) > MAXSHORT ? MAXSHORT : (v))
 
-static __inline int
+static INLINE int
 FbClipImageReg (pixman_region16_t	*region,
 		pixman_region16_t	*clip,
 		int		dx,
@@ -594,7 +594,7 @@ FbClipImageReg (pixman_region16_t	*regio
     return 1;
 }
 
-static __inline int
+static INLINE int
 FbClipImageSrc (pixman_region16_t	*region,
 		pixman_image_t		*image,
 		int		dx,
--- cairo-1.3.6/pixman/src/pixregion.c-orig	2007-02-28 15:08:34.843838000 +0800
+++ cairo-1.3.6/pixman/src/pixregion.c	2007-02-28 15:09:30.417349000 +0800
@@ -50,12 +50,7 @@ SOFTWARE.
 #include <string.h>
 
 #include "pixregionint.h"
-
-#if defined (__GNUC__) && !defined (NO_INLINES)
-#define INLINE	__inline
-#else
-#define INLINE
-#endif
+#include "icint.h"
 
 #undef assert
 #ifdef DEBUG_PIXREGION
@@ -469,7 +464,7 @@ pixman_region_copy(pixman_region16_t *ds
  *
  *-----------------------------------------------------------------------
  */
-INLINE static int
+static INLINE int
 pixman_coalesce (
     pixman_region16_t *	region,	    	/* Region to coalesce		     */
     int	    	  	prevStart,  	/* Index of start of previous band   */
@@ -552,7 +547,7 @@ pixman_coalesce (
  *-----------------------------------------------------------------------
  */
 
-INLINE static pixman_region_status_t
+static INLINE pixman_region_status_t
 pixman_region_appendNonO (
     pixman_region16_t *	region,
     pixman_box16_t *	r,