httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/shmem/unix/mm aclocal.m4 config.guess mm.h
Date Sun, 30 Apr 2000 03:01:37 GMT
trawick     00/04/29 20:01:37

  Modified:    src      CHANGES
               src/lib/apr/shmem/unix/mm aclocal.m4 config.guess mm.h
  Log:
  Fix mm configuration on Solaris 8 x86 and OS/390.  Don't require
  /sbin in PATH on FreeBSD. (all submitted to rse previously)
  
  Revision  Changes    Path
  1.92      +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- CHANGES	2000/04/30 02:42:22	1.91
  +++ CHANGES	2000/04/30 03:01:35	1.92
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a4-dev
  +  *) Fix mm configuration on Solaris 8 x86 and OS/390.  Don't require
  +     /sbin in PATH on FreeBSD (all submitted to rse previously) 
  +     [Jeff Trawick]
  +
     *) Fix building Pthread-based MPMs on OpenBSD
        [Sascha Schumann] PR#26
   
  
  
  
  1.4       +9 -0      apache-2.0/src/lib/apr/shmem/unix/mm/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/aclocal.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- aclocal.m4	2000/04/13 11:03:20	1.3
  +++ aclocal.m4	2000/04/30 03:01:36	1.4
  @@ -231,6 +231,9 @@
   #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 @@
   #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>
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/shmem/unix/mm/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/config.guess,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- config.guess	2000/04/13 11:25:31	1.3
  +++ config.guess	2000/04/30 03:01:36	1.4
  @@ -581,7 +581,7 @@
       *: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" ;;
  
  
  
  1.6       +6 -0      apache-2.0/src/lib/apr/shmem/unix/mm/mm.h
  
  Index: mm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mm.h	2000/04/28 18:27:45	1.5
  +++ mm.h	2000/04/30 03:01:36	1.6
  @@ -170,6 +170,12 @@
   
   #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)
  
  
  

Mime
View raw message