diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 09:42:32 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-19 09:49:26 +0100 |
| commit | 546bb6c9b79bf9571a5089a2e2a5dc8b2642164e (patch) | |
| tree | 75fe0fa9e076a1dc0bcef5229e72082e5a5f0646 /cairo | |
| parent | 418dcec256481791721fb13fd4cdfe07074403fb (diff) | |
Fix MMX build of pixman with MSVC
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/pixman-0.24.0.patch | 31 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 |
2 files changed, 32 insertions, 1 deletions
diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch index 0611962a96d5..c848666cf331 100644 --- a/cairo/pixman-0.24.0.patch +++ b/cairo/pixman-0.24.0.patch @@ -103,3 +103,34 @@ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } if test "${ac_cv_c_bigendian+set}" = set; then +--- misc/pixman-0.24.0/pixman/pixman-utils.c ++++ misc/build/pixman-0.24.0/pixman/pixman-utils.c +@@ -27,6 +27,7 @@ + #endif + #include <stdio.h> + #include <stdlib.h> ++#include <limits.h> + + #include "pixman-private.h" + +--- misc/pixman-0.24.0/pixman/pixman-mmx.c 2011-11-06 13:47:42.000000000 -0700 ++++ misc/build/pixman-0.24.0/pixman/pixman-mmx.c 2011-12-19 00:41:42.280402800 -0700 +@@ -309,7 +309,7 @@ + + /* Elemental unaligned loads */ + +-static __inline__ __m64 ldq_u(uint64_t *p) ++static inline __m64 ldq_u(uint64_t *p) + { + #ifdef USE_X86_MMX + /* x86's alignment restrictions are very relaxed. */ +@@ -328,7 +328,7 @@ + #endif + } + +-static __inline__ uint32_t ldl_u(uint32_t *p) ++static inline uint32_t ldl_u(uint32_t *p) + { + #ifdef USE_X86_MMX + /* x86's alignment restrictions are very relaxed. */ + diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index df9c795c94eb..225ae866386c 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -70,7 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # WNT, not GCC BUILD_DIR=pixman -BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=off SSE2=on CFG=release +BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release .ENDIF .ELIF "$(GUIBASE)"=="aqua" |