pixman: Branch 'master'

[Søren Sandmann Pedersen]

 test/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56777f3f675869806cd30bcd21a5b39d788507cb
Author: Dmitri Vorobiev <dmitri.vorobiev at movial.com>
Date:   Wed Sep 22 12:34:57 2010 +0300

    Use <sys/mman.h> macros only when they are available
    
    Not all systems are regular Unices, so let's be careful with the
    mmap()-related stuff, which might be unavailable. This patch makes
    sure that mmap() and friends is used only when the <sys/mman.h>
    header is found.

diff --git a/test/utils.c b/test/utils.c
index 448c296..2ed5051 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -218,7 +218,7 @@ typedef struct
     int n_bytes;
 } info_t;
 
-#if defined(HAVE_MPROTECT) && defined(HAVE_GETPAGESIZE)
+#if defined(HAVE_MPROTECT) && defined(HAVE_GETPAGESIZE) && defined(HAVE_SYS_MMAN_H)
 
 /* This is apparently necessary on at least OS X */
 #ifndef MAP_ANONYMOUS