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

[GitLab Mirror]

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

New commits:
commit e7aa3a4c09beca6758b9787316f7fcc089868ede
Merge: 0317aafd3 baf259385
Author: Uli Schlachter <psychon at znc.in>
Date:   Mon Jul 3 15:06:14 2023 +0000

    Merge branch 'hurd' into 'master'
    
    Hurd has no MAP_NORESERVE so don't use it there
    
    See merge request cairo/cairo!486

commit baf2593852d8df3e4f9a4216ed117fd184eaa742
Author: Sebastian Dröge <slomo at debian.org>
Date:   Fri Mar 30 09:49:05 2012 +0200

    Hurd has no MAP_NORESERVE so don't use it there

diff --git a/test/cairo-test-trace.c b/test/cairo-test-trace.c
index 78e822cf1..32987a7ad 100644
--- a/test/cairo-test-trace.c
+++ b/test/cairo-test-trace.c
@@ -552,7 +552,11 @@ spawn_shm (const char *shm_path)
 
     base = mmap (NULL, DATA_SIZE,
 		 PROT_READ | PROT_WRITE,
+#ifdef MAP_NORESERVE
 		 MAP_SHARED | MAP_NORESERVE,
+#else
+		 MAP_SHARED,
+#endif
 		 fd, 0);
     close (fd);
 
diff --git a/util/cairo-sphinx/sphinx.c b/util/cairo-sphinx/sphinx.c
index 741e406d6..467f26cab 100644
--- a/util/cairo-sphinx/sphinx.c
+++ b/util/cairo-sphinx/sphinx.c
@@ -1347,7 +1347,11 @@ client_shm (const char *shm_path)
 
     base = mmap (NULL, DATA_SIZE,
 		 PROT_READ | PROT_WRITE,
+#ifdef MAP_NORESERVE
 		 MAP_SHARED | MAP_NORESERVE,
+#else
+		 MAP_SHARED,
+#endif
 		 fd, 0);
     close (fd);