summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiarhei Siamashka <siarhei.siamashka@gmail.com>2012-10-19 01:59:16 +0300
committerSiarhei Siamashka <siarhei.siamashka@gmail.com>2012-10-25 00:39:41 +0300
commit9df645dfb04b5a790faabe1e9a84fc37287d91b0 (patch)
tree253d5a5159bcc5f36ea33edd525b220747e40b4b
parent31e5a0a393defb8e0534ab1bde29ab23fc04795d (diff)
Workaround for FTBFS with gcc 4.6 (http://gcc.gnu.org/PR54965)
GCC 4.6 has problems with force_inline, so just use normal inline instead. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=55630
-rw-r--r--pixman/pixman-combine-float.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/pixman/pixman-combine-float.c b/pixman/pixman-combine-float.c
index 7bf5b5a..c3d54f0 100644
--- a/pixman/pixman-combine-float.c
+++ b/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