From 12c739704841da23a63589aafeabf501a696c60e Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 21 Aug 2024 07:27:59 +0000 Subject: [PATCH] Merge r1901037 from trunk: Prefer posix shared mem over SysV in all cases: Have name based order same as anon Submitted by: jim Reviewed by: jorton git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1920094 13f79535-47bb-0310-9956-ffa450edef68 --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 205b9ce1a3..b0457e2eca 100644 --- a/configure.in +++ b/configure.in @@ -1498,6 +1498,10 @@ havebeosarea="0" haveos2shm="0" havewin32shm="0" APR_BEGIN_DECISION([namebased memory allocation method]) +APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl + func:shmget func:shmat func:shmdt func:shmctl, + [haveshmget="1" + APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, [havemmaptmp="1" APR_DECIDE(USE_SHMEM_MMAP_TMP, @@ -1507,10 +1511,6 @@ APR_IFALLYES(header:sys/mman.h func:mmap func:munmap func:shm_open dnl [havemmapshm="1" APR_DECIDE(USE_SHMEM_MMAP_SHM, [mmap() via POSIX.1 shm_open() on temporary file])]) -APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) APR_IFALLYES(header:kernel/OS.h func:create_area, [havebeosshm="1" APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])