Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 52950 invoked by uid 500); 19 Mar 2003 04:25:42 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 52939 invoked from network); 19 Mar 2003 04:25:41 -0000 Date: 19 Mar 2003 04:25:39 -0000 Message-ID: <20030319042539.21826.qmail@icarus.apache.org> From: wrowe@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/include/arch/unix apr_arch_inherit.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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) \ { \