apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/include apr_portable.h
Date Wed, 15 Aug 2001 18:06:47 GMT
trawick     01/08/15 11:06:47

  Modified:    build    apr_hints.m4
               include  apr_portable.h
  Log:
  APR doesn't need to define union semun for apps; the
  logic didn't work quite right anyway
  
  we had NEED_UNION_SEMUN vs. APR_HAVE_UNION_SEMUN mixed up
  
  we included sys/sem.h when we didn't need to define union semun
  but we'd need it the header file if we tried to define it
  so that struct semid_ds would be defined
  
  Revision  Changes    Path
  1.20      +1 -1      apr/build/apr_hints.m4
  
  Index: apr_hints.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_hints.m4,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apr_hints.m4	2001/08/15 16:01:24	1.19
  +++ apr_hints.m4	2001/08/15 18:06:46	1.20
  @@ -240,7 +240,7 @@
   	APR_ADDTO(CPPFLAGS, [-DSVR4 -D_XPG_IV])
   	;;
       *-siemens-sysv4*)
  -	APR_ADDTO(CPPFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT
-DNEED_UNION_SEMUN])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT])
   	APR_ADDTO(LIBS, [-lc])
   	;;
       pyramid-pyramid-svr4)
  
  
  
  1.68      +0 -12     apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_portable.h,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- apr_portable.h	2001/08/12 04:39:14	1.67
  +++ apr_portable.h	2001/08/15 18:06:47	1.68
  @@ -88,9 +88,6 @@
   #if APR_HAVE_PTHREAD_H
   #include <pthread.h>
   #endif
  -#if APR_HAVE_UNION_SEMUN
  -#include <sys/sem.h>
  -#endif
   
   #ifdef __cplusplus
   extern "C" {
  @@ -157,15 +154,6 @@
   /* Any other OS should go above this one.  This is the lowest common
    * denominator typedefs for  all UNIX-like systems.  :)
    */
  -
  -#ifdef NEED_UNION_SEMUN
  -/* it makes no sense, but this isn't defined on solaris */
  -union semun {
  -    long val;
  -    struct semid_ds *buf;
  -    ushort *array;
  -};
  -#endif
   
   struct apr_os_lock_t {
   #if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
  
  
  

Mime
View raw message