You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by co...@apache.org on 2023/01/19 22:45:47 UTC
svn commit: r1906827 - in /apr/apr/branches/1.7.x: ./ configure.in
Author: covener
Date: Thu Jan 19 22:45:47 2023
New Revision: 1906827
URL: http://svn.apache.org/viewvc?rev=1906827&view=rev
Log:
Merge r1906826 from 1.8.x:
Merge r1906825 from trunk:
force USE_SHMEM_SHMGET on AIX
prior to r1901037 on trunk, USE_SHMEM_SHMGET is used.
APR_USE_SHMEM_MMAP_SHM does not currently work on AIX.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/configure.in
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/branches/1.8.x:r1906826
Merged /apr/apr/trunk:r1906825
Modified: apr/apr/branches/1.7.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/configure.in?rev=1906827&r1=1906826&r2=1906827&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/configure.in (original)
+++ apr/apr/branches/1.7.x/configure.in Thu Jan 19 22:45:47 2023
@@ -1447,6 +1447,10 @@ case $host in
USE_SHMEM_SHMGET)
fi
;;
+ *aix* )
+ # AIX cannot lseek() shared memory, and we always truncate/lseek together
+ APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET)
+ ;;
esac
APR_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)