diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-19 04:25:38 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-19 04:25:38 +0000 |
| commit | 5ca8fa897c0891b7711aeeb03ffdec5ef665ca81 (patch) | |
| tree | e4dccc261cbb37b25f2e2d72388878d7e772f670 | |
| parent | 410ee144d6dbd847a6a071d9c99f0eaea5a9c0d5 (diff) | |
| download | libapr-5ca8fa897c0891b7711aeeb03ffdec5ef665ca81.tar.gz | |
Simply move a declaration to make the CLOEXEC patch much easier to read.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64431 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/arch/unix/apr_arch_inherit.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/arch/unix/apr_arch_inherit.h b/include/arch/unix/apr_arch_inherit.h index c4c726770..57f9e6872 100644 --- a/include/arch/unix/apr_arch_inherit.h +++ b/include/arch/unix/apr_arch_inherit.h @@ -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 @@ apr_status_t apr_##name##_inherit_set(apr_##name##_t *the##name) \ 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 @@ apr_status_t apr_##name##_inherit_unset(apr_##name##_t *the##name) \ 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) \ { \ |