diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
| commit | ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4 (patch) | |
| tree | b18ae337e913f36a95f97530f6a792e9366a393c /pixman | |
| parent | 4207bc7b2972aed9a45756fae8c48957d323fa21 (diff) | |
| parent | 0e3699334faf92f508b6c187a261548b656b0dd3 (diff) | |
| download | vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.gz vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.bz2 vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/resource.c
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 56ef10ebf..b8d59f625 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -566,7 +566,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #error "IWMMXT is only available on ARM" #endif #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)) -#error "Need GCC >= 4.6 for IWMMXT intrinsics" +#error "Need GCC >= 4.5 for IWMMXT intrinsics" #endif #include <mmintrin.h> int main () { |