diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-10 13:36:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-10 13:36:25 +0000 |
| commit | 2e5094b5a8e6241621cbf8c3e41b618347de7e2f (patch) | |
| tree | 5e6023f9a98e76859ed4d6184f4e4ae50877db7a /pixman | |
| parent | 495e1bd0f33256db726731f949d2a95e75d106b8 (diff) | |
| parent | 0f6aea154580c2f220be98d12108dd7d316c21f6 (diff) | |
| download | vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.tar.gz vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.tar.bz2 vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.zip | |
svn merge ^/branches/released .
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 3540c824c..cf3a89fe5 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 2f1565840..06c5e5128 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
|