diff options
| author | Jim Jagielski <jim@apache.org> | 2022-05-18 14:53:53 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2022-05-18 14:53:53 +0000 |
| commit | ebd6c401ccceea461a929122526caacf9c9e7b1d (patch) | |
| tree | b9885c18eb2f27c58469f93fcb04cd53f4f43b18 | |
| parent | 63c68a4093dd7e6c9336e6ffcd35fc5bd6a5d8f2 (diff) | |
| download | apr-ebd6c401ccceea461a929122526caacf9c9e7b1d.tar.gz | |
Merge r1901037 from trunk:
Prefer posix shared mem over SysV in all cases:
Have name based order same as anon
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1901038 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -8,6 +8,9 @@ Changes for APR 1.7.1 *) apr_atomic_read64(): Fix non-atomic read on 32-bit Windows [Ivan Zhakov] + *) configure: Prefer posix name-based shared memory over SysV IPC. + [Jim Jagielski] + *) configure: Add --disable-sctp argument to forcibly disable SCTP support, or --enable-sctp which fails if SCTP support is not detected. [Lubos Uhliarik <luhliari redhat.com>, Joe Orton] @@ -80,7 +83,7 @@ Changes for APR 1.7.0 [Oleg Liatte <olegliatte gmail.com>] *) Test %ld vs. %lld to avoid compiler emits using APR_OFF_T_FMT, in the - case of apparently equivilant long and long long types. [William Rowe] + case of apparently equivilant long and long long types. [William Rowe] *) Recognize APPLE predefined macros as equivilant to DARWIN. [Jim Jagielski] diff --git a/configure.in b/configure.in index 28c8d44db..2fbd0a131 100644 --- a/configure.in +++ b/configure.in @@ -1320,6 +1320,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, @@ -1329,10 +1333,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])]) |