diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
| commit | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (patch) | |
| tree | 222a1d19624e55a205786f54edd7892aae79a7bd /pixman | |
| parent | b929a2bab9e244cbc823f7bb2fe9e21537e3ceb7 (diff) | |
| parent | 281f26a1dfda732687680a36857960f74608df5b (diff) | |
| download | vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.gz vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.bz2 vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/pixman/pixman-combine-float.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 |