From 0f6aea154580c2f220be98d12108dd7d316c21f6 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 10 May 2011 13:17:13 +0000 Subject: libfontenc pixman mesa git update 10 May 2011 --- pixman/configure.ac | 5 +++++ pixman/test/utils.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'pixman') diff --git a/pixman/configure.ac b/pixman/configure.ac index 9a8ebe90a..2defbd4a2 100644 --- a/pixman/configure.ac +++ b/pixman/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 ])]) +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/pixman/test/utils.c b/pixman/test/utils.c index 56701c4bb..402560227 100644 --- a/pixman/test/utils.c +++ b/pixman/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 -- cgit v1.2.3