From 281f26a1dfda732687680a36857960f74608df5b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 25 Oct 2012 09:59:33 +0200
Subject: fontconfig mesa pixman git update

fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822
mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a
pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
---
 pixman/pixman/pixman-combine-float.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'pixman')

diff --git a/pixman/pixman/pixman-combine-float.c b/pixman/pixman/pixman-combine-float.c
index 7bf5b5ae7..c3d54f025 100644
--- a/pixman/pixman/pixman-combine-float.c
+++ b/pixman/pixman/pixman-combine-float.c
@@ -35,6 +35,13 @@
 
 #include "pixman-private.h"
 
+/* Workaround for http://gcc.gnu.org/PR54965 */
+/* GCC 4.6 has problems with force_inline, so just use normal inline instead */
+#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)
+#undef force_inline
+#define force_inline __inline__
+#endif
+
 typedef float (* combine_channel_t) (float sa, float s, float da, float d);
 
 static force_inline void
-- 
cgit v1.2.3