diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-30 03:01:36 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-30 03:01:36 +0000 |
| commit | b69f74d23a86fe9d435ce5113c49c3d02738c385 (patch) | |
| tree | 238b10a5affc6aa1415e99b38ac33138a01c644b /shmem | |
| parent | a0ee46eee1d981a5d37719b2e93c1a53d6e8dbd0 (diff) | |
| download | libapr-b69f74d23a86fe9d435ce5113c49c3d02738c385.tar.gz | |
Fix mm configuration on Solaris 8 x86 and OS/390. Don't require
/sbin in PATH on FreeBSD. (all submitted to rse previously)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59994 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
| -rw-r--r-- | shmem/unix/mm/aclocal.m4 | 9 | ||||
| -rwxr-xr-x | shmem/unix/mm/config.guess | 2 | ||||
| -rw-r--r-- | shmem/unix/mm/mm.h | 6 |
3 files changed, 16 insertions, 1 deletions
diff --git a/shmem/unix/mm/aclocal.m4 b/shmem/unix/mm/aclocal.m4 index ad9f0147d..0bbf26bc4 100644 --- a/shmem/unix/mm/aclocal.m4 +++ b/shmem/unix/mm/aclocal.m4 @@ -231,6 +231,9 @@ changequote(<<, >>)dnl #include <sys/file.h> #include <sys/types.h> #include <sys/stat.h> +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif #ifdef TEST_MMAP #include <sys/mman.h> #endif @@ -238,6 +241,12 @@ changequote(<<, >>)dnl #include <sys/ipc.h> #ifndef _OSD_POSIX #include <sys/shm.h> +#if !defined(SHM_R) +#define SHM_R 0400 +#endif +#if !defined(SHM_W) +#define SHM_W 0200 +#endif #else #define _KMEMUSER 1 /* BS2000 needs this to enable SHM_[RW] */ #include <sys/shm.h> diff --git a/shmem/unix/mm/config.guess b/shmem/unix/mm/config.guess index 16942ccf6..5523028af 100755 --- a/shmem/unix/mm/config.guess +++ b/shmem/unix/mm/config.guess @@ -581,7 +581,7 @@ EOF *:FreeBSD:*:*) # echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` VERS=`echo ${UNAME_RELEASE} | sed -e 's/[-(].*//'` - MACH=`sysctl -n hw.model` + MACH=`/sbin/sysctl -n hw.model` ARCH='unknown' case ${MACH} in *386* ) MACH="i386" ;; diff --git a/shmem/unix/mm/mm.h b/shmem/unix/mm/mm.h index 3c029e630..314478bd3 100644 --- a/shmem/unix/mm/mm.h +++ b/shmem/unix/mm/mm.h @@ -170,6 +170,12 @@ extern char *strerror(int); #if defined(MM_SHMT_IPCSHM) #include <sys/shm.h> +#if !defined(SHM_R) +#define SHM_R 0400 +#endif +#if !defined(SHM_W) +#define SHM_W 0200 +#endif #endif #if defined(MM_SEMT_IPCSEM) |