apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr/build apr_hints.m4
Date Thu, 26 Feb 2004 21:18:02 GMT
jorton      2004/02/26 13:18:02

  Modified:    shmem/unix Tag: APR_0_9_BRANCH shm.c
               build    Tag: APR_0_9_BRANCH apr_hints.m4
  Log:
  Backport Tru64 fixes from HEAD:
  
  * shmem/unix/shm.c (apr_shm_create): Fix build with Tru64 "cc -std";
  cast MAP_FAILED to (void *).
  
  * build/apr_hints.m4: Disable use of POSIX process-shared mutexes on
  Tru64 since they don't seem to be working.  (these are selected as the
  default locking mechanism since the "mmap of /dev/zero" configure test
  was fixed!)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.21.2.2  +2 -2      apr/shmem/unix/shm.c
  
  Index: shm.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/unix/shm.c,v
  retrieving revision 1.21.2.1
  retrieving revision 1.21.2.2
  diff -w -d -u -r1.21.2.1 -r1.21.2.2
  --- shm.c	13 Feb 2004 09:33:51 -0000	1.21.2.1
  +++ shm.c	26 Feb 2004 21:18:01 -0000	1.21.2.2
  @@ -139,7 +139,7 @@
   
           new_m->base = mmap(NULL, new_m->realsize, PROT_READ|PROT_WRITE,
                              MAP_SHARED, tmpfd, 0);
  -        if (new_m->base == MAP_FAILED) {
  +        if (new_m->base == (void *)MAP_FAILED) {
               return errno;
           }
   
  @@ -161,7 +161,7 @@
   #elif APR_USE_SHMEM_MMAP_ANON
           new_m->base = mmap(NULL, new_m->realsize, PROT_READ|PROT_WRITE,
                              MAP_ANON|MAP_SHARED, -1, 0);
  -        if (new_m->base == MAP_FAILED) {
  +        if (new_m->base == (void *)MAP_FAILED) {
               return errno;
           }
   
  
  
  
  No                   revision
  No                   revision
  1.53.2.3  +2 -0      apr/build/apr_hints.m4
  
  Index: apr_hints.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_hints.m4,v
  retrieving revision 1.53.2.2
  retrieving revision 1.53.2.3
  diff -w -d -u -r1.53.2.2 -r1.53.2.3
  --- apr_hints.m4	25 Jan 2004 17:00:51 -0000	1.53.2.2
  +++ apr_hints.m4	26 Feb 2004 21:18:02 -0000	1.53.2.3
  @@ -155,6 +155,8 @@
   	;;
       *-dec-osf*)
   	APR_ADDTO(CPPFLAGS, [-DOSF1])
  +        # process-shared mutexes don't seem to work in Tru64 5.0
  +        APR_SETIFNULL(apr_cv_process_shared_works, [no])
   	;;
       *-nto-qnx*)
   	;;
  
  
  

Mime
View raw message