Merge branch 'hurd' into 'master'

Hurd has no MAP_NORESERVE so don't use it there

See merge request cairo/cairo!486
This commit is contained in:
Uli Schlachter 2023-07-03 15:06:14 +00:00
commit e7aa3a4c09
2 changed files with 8 additions and 0 deletions

View file

@ -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);

View file

@ -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);