pixman: Branch 'master'

[Søren Sandmann Pedersen]

 configure.ac |    5 +++++
 test/utils.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 838c2b593ec5ebbbf82de5b7790f5b68fd86bbc1
Author: Dave Yeo <dave.r.yeo at gmail.com>
Date:   Mon May 9 12:38:44 2011 +0200

    Check for working mmap()
    
    OS/2 doesn't have a working mmap().

diff --git a/configure.ac b/configure.ac
index 9a8ebe9..2defbd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,6 +650,11 @@ fi
 AC_CHECK_HEADER([sys/mman.h],
    [AC_DEFINE(HAVE_SYS_MMAN_H, [1], [Define to 1 if we have <sys/mman.h>])])
 
+AC_CHECK_FUNC(mmap, have_mmap=yes, have_mmap=no)
+if test x$have_mmap = xyes; then
+   AC_DEFINE(HAVE_MMAP, 1, [Whether we have mmap()])
+fi
+
 AC_CHECK_FUNC(mprotect, have_mprotect=yes, have_mprotect=no)
 if test x$have_mprotect = xyes; then
    AC_DEFINE(HAVE_MPROTECT, 1, [Whether we have mprotect()])
diff --git a/test/utils.c b/test/utils.c
index 56701c4..4025602 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -229,7 +229,7 @@ typedef struct
     int n_bytes;
 } info_t;
 
-#if defined(HAVE_MPROTECT) && defined(HAVE_GETPAGESIZE) && defined(HAVE_SYS_MMAN_H)
+#if defined(HAVE_MPROTECT) && defined(HAVE_GETPAGESIZE) && defined(HAVE_SYS_MMAN_H) && defined(HAVE_MMAP)
 
 /* This is apparently necessary on at least OS X */
 #ifndef MAP_ANONYMOUS