pixman: Branch 'master'
Siarhei Siamashka
siamashka at kemper.freedesktop.org
Wed Oct 24 14:46:39 PDT 2012
pixman/pixman-combine-float.c | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 9df645dfb04b5a790faabe1e9a84fc37287d91b0
Author: Siarhei Siamashka <siarhei.siamashka at gmail.com>
Date: Fri Oct 19 01:59:16 2012 +0300
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
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
More information about the xorg-commit
mailing list