diff options
| author | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2022-06-17 20:09:40 +0000 |
|---|---|---|
| committer | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2022-06-17 20:09:40 +0000 |
| commit | ae4fdf084ed4f1aeb97de46ac66c1ec8831f84d7 (patch) | |
| tree | 4ce755a79812548000070ffcdb4a5758a909e779 | |
| parent | be04e7661c80c30d5f06c3ecd8193f77f65b0fa6 (diff) | |
| download | libapr-ae4fdf084ed4f1aeb97de46ac66c1ec8831f84d7.tar.gz | |
Revert r1897209 and r1863234 to preserve ABI on 1.7.x.
Per https://lists.apache.org/thread/wkz9snh2551wrqfj0g0f7om442ncnbyq
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1902022 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/apr_pools.h | 17 | ||||
| -rw-r--r-- | memory/unix/apr_pools.c | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/include/apr_pools.h b/include/apr_pools.h index 88a59ed41..eae9c2183 100644 --- a/include/apr_pools.h +++ b/include/apr_pools.h @@ -754,14 +754,11 @@ APR_DECLARE(void) apr_pool_cleanup_for_exec(void); * In this case the caller must call apr_pool_join() to indicate this * guarantee to the APR_POOL_DEBUG code. * - * These functions are implemented when #APR_POOL_DEBUG is set and - * defined as no-op macros otherwise. + * These functions are only implemented when #APR_POOL_DEBUG is set. * * @{ */ - #if APR_POOL_DEBUG || defined(DOXYGEN) - /** * Guarantee that a subpool has the same lifetime as the parent. * @param p The parent pool @@ -793,18 +790,18 @@ APR_DECLARE(apr_size_t) apr_pool_num_bytes(apr_pool_t *p, int recurse) */ APR_DECLARE(void) apr_pool_lock(apr_pool_t *pool, int flag); +/** @} */ + #else /* APR_POOL_DEBUG or DOXYGEN */ +#ifdef apr_pool_join #undef apr_pool_join +#endif #define apr_pool_join(a,b) -#undef apr_pool_find -#define apr_pool_find(mem) (NULL) - -#undef apr_pool_num_bytes -#define apr_pool_num_bytes(p, rec) ((apr_size_t)0) - +#ifdef apr_pool_lock #undef apr_pool_lock +#endif #define apr_pool_lock(pool, lock) #endif /* APR_POOL_DEBUG or DOXYGEN */ diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 535872b20..396506d7e 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -2834,13 +2834,13 @@ static void free_proc_chain(struct process_chain *procs) } } -#if !APR_POOL_DEBUG /* * Pool creation/destruction stubs, for people who are running * mixed release/debug enviroments. */ +#if !APR_POOL_DEBUG APR_DECLARE(void *) apr_palloc_debug(apr_pool_t *pool, apr_size_t size, const char *file_line) { |