diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-10 13:17:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-10 13:17:13 +0000 |
| commit | 0f6aea154580c2f220be98d12108dd7d316c21f6 (patch) | |
| tree | c60630ec6de1c0b2a4367133a15a19300afb8625 /pixman | |
| parent | 43b2398ee28e9144fd51eb9994d67c4c9a198c9c (diff) | |
| download | vcxsrv-0f6aea154580c2f220be98d12108dd7d316c21f6.tar.gz vcxsrv-0f6aea154580c2f220be98d12108dd7d316c21f6.tar.bz2 vcxsrv-0f6aea154580c2f220be98d12108dd7d316c21f6.zip | |
libfontenc pixman mesa git update 10 May 2011
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 5 | ||||
| -rw-r--r-- | pixman/test/utils.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <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/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 |