[cairo-commit] test/cairo-test-trace.c util/cairo-sphinx

[Bryce Harrington]

 test/cairo-test-trace.c    |    4 ++++
 util/cairo-sphinx/sphinx.c |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit f72bd7c7574fc8fdc1f495f3a50111329851edc5
Author: Michael Haubenwallner <michael.haubenwallner at ssi-schaefer.com>
Date:   Thu Feb 26 15:23:01 2015 +0100

    skip MAP_NORESERVE when unsupported
    
    Fixes a compilation on AIX ('MAP_NORESERVE' undeclared)
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=89340
    Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>

diff --git a/test/cairo-test-trace.c b/test/cairo-test-trace.c
index 52d9dd9..5badc43 100644
--- a/test/cairo-test-trace.c
+++ b/test/cairo-test-trace.c
@@ -91,6 +91,10 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
+#ifndef MAP_NORESERVE
+#define MAP_NORESERVE 0
+#endif
+
 #define DEBUG 0
 
 #define ignore_image_differences 0 /* XXX make me a cmdline option! */
diff --git a/util/cairo-sphinx/sphinx.c b/util/cairo-sphinx/sphinx.c
index 3a6c04c..238d400 100644
--- a/util/cairo-sphinx/sphinx.c
+++ b/util/cairo-sphinx/sphinx.c
@@ -35,6 +35,10 @@
 # error "cairo-sphinx needs real pthreads"
 #endif
 
+#ifndef MAP_NORESERVE
+#define MAP_NORESERVE 0
+#endif
+
 #define DATA_SIZE (256 << 20)
 #define SHM_PATH_XXX "/shmem-cairo-sphinx"