diff options
| author | aaron <aaron@13f79535-47bb-0310-9956-ffa450edef68> | 2002-04-09 06:56:56 +0000 |
|---|---|---|
| committer | aaron <aaron@13f79535-47bb-0310-9956-ffa450edef68> | 2002-04-09 06:56:56 +0000 |
| commit | 5012b3e8eb1ee9929aecad60a9c9ac440dd75f57 (patch) | |
| tree | 7e9b75de87328965023c39fdb1e7e7abc9fff77f /include/apr_allocator.h | |
| parent | 7175e52e6224f552dc90ff091b42a11d378c14cb (diff) | |
| download | libapr-5012b3e8eb1ee9929aecad60a9c9ac440dd75f57.tar.gz | |
** DEPRECATE old lock API: apr_lock.h **
Resolve some circular includes (apr_thread_mutex.h needs apr_pools.h needs
apr_allocator.h needs apr_thread_mutex.h ...).
Remove all apr_lock.h related files (incl. arch-specific headers and
implementations).
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63234 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_allocator.h')
| -rw-r--r-- | include/apr_allocator.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/apr_allocator.h b/include/apr_allocator.h index a2d2aa1bb..079dee778 100644 --- a/include/apr_allocator.h +++ b/include/apr_allocator.h @@ -76,10 +76,6 @@ extern "C" { #define APR_WANT_MEMFUNC #include "apr_want.h" -#include "apr_thread_mutex.h" -#include "apr_pools.h" - - /** the allocator structure */ typedef struct apr_allocator_t apr_allocator_t; /** the structure which holds information about the allocation */ @@ -132,6 +128,9 @@ APR_DECLARE(apr_memnode_t *) apr_allocator_alloc(apr_allocator_t *allocator, APR_DECLARE(void) apr_allocator_free(apr_allocator_t *allocator, apr_memnode_t *memnode); + +#include "apr_pools.h" + /** * Set the owner of the allocator * @param allocator The allocator to set the owner for @@ -152,6 +151,8 @@ APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator, */ APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(apr_allocator_t *allocator); +#include "apr_thread_mutex.h" + #if APR_HAS_THREADS /** * Set a mutex for the allocator to use |