apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/include/arch/unix apr_arch_inherit.h
Date Wed, 19 Mar 2003 04:25:39 GMT
wrowe       2003/03/18 20:25:38

  Modified:    include/arch/unix apr_arch_inherit.h
  Log:
    Simply move a declaration to make the CLOEXEC patch much easier to read.
  
  Revision  Changes    Path
  1.3       +10 -8     apr/include/arch/unix/apr_arch_inherit.h
  
  Index: apr_arch_inherit.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/apr_arch_inherit.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_arch_inherit.h	19 Mar 2003 04:21:58 -0000	1.2
  +++ apr_arch_inherit.h	19 Mar 2003 04:25:38 -0000	1.3
  @@ -59,7 +59,7 @@
   
   #define APR_INHERIT (1 << 24)    /* Must not conflict with other bits */
   
  -#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
  +#define APR_IMPLEMENT_INHERIT_SET(name, flag, fd, pool, cleanup)    \
   apr_status_t apr_##name##_inherit_set(apr_##name##_t *the##name)    \
   {                                                                   \
       if (the##name->flag & APR_FILE_NOCLEANUP)                       \
  @@ -71,14 +71,9 @@
                                      cleanup, apr_pool_cleanup_null); \
       }                                                               \
       return APR_SUCCESS;                                             \
  -}                                                                   \
  -/* Deprecated */                                                    \
  -void apr_##name##_set_inherit(apr_##name##_t *the##name)            \
  -{                                                                   \
  -    apr_##name##_inherit_set(the##name);                            \
   }
   
  -#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
  +#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, fd, pool, cleanup)  \
   apr_status_t apr_##name##_inherit_unset(apr_##name##_t *the##name)  \
   {                                                                   \
       if (the##name->flag & APR_FILE_NOCLEANUP)                       \
  @@ -90,7 +85,14 @@
                                      cleanup, cleanup);               \
       }                                                               \
       return APR_SUCCESS;                                             \
  -}                                                                   \
  +}
  +
  +/* Deprecated */                                                    \
  +void apr_##name##_set_inherit(apr_##name##_t *the##name)            \
  +{                                                                   \
  +    apr_##name##_inherit_set(the##name);                            \
  +}
  +
   /* Deprecated */                                                    \
   void apr_##name##_unset_inherit(apr_##name##_t *the##name)          \
   {                                                                   \
  
  
  

Mime
View raw message