diff options
| -rw-r--r-- | include/apr_allocator.h | 2 | ||||
| -rw-r--r-- | include/apr_user.h | 1 | ||||
| -rw-r--r-- | include/apr_xlate.h | 2 | ||||
| -rw-r--r-- | memory/unix/apr_pools.c | 6 |
4 files changed, 5 insertions, 6 deletions
diff --git a/include/apr_allocator.h b/include/apr_allocator.h index 25e635c08..e5eba0a62 100644 --- a/include/apr_allocator.h +++ b/include/apr_allocator.h @@ -158,7 +158,7 @@ APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator, APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator); /** @deprecated @see apr_allocator_owner_get */ -APR_DECLARE(apr_pool_t *pool) apr_allocator_get_owner( +APR_DECLARE(apr_pool_t *) apr_allocator_get_owner( apr_allocator_t *allocator); /** diff --git a/include/apr_user.h b/include/apr_user.h index cda0d7c0b..e54411043 100644 --- a/include/apr_user.h +++ b/include/apr_user.h @@ -158,7 +158,6 @@ APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p); /** @deprecated @see apr_group_name_get */ -#define apr_get_groupname apr_group_name_get APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, apr_gid_t groupid, apr_pool_t *p); diff --git a/include/apr_xlate.h b/include/apr_xlate.h index 0f96b33cc..f9c5040ee 100644 --- a/include/apr_xlate.h +++ b/include/apr_xlate.h @@ -132,7 +132,7 @@ APR_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset, APR_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff); /** @deprecated @see apr_xlate_sb_get */ -APR_DECLARE(void) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff); +APR_DECLARE(apr_status_t) apr_xlate_get_sb(apr_xlate_t *convset, int *onoff); /** * Convert a buffer of text from one codepage to another. diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 27fd52b0e..6a2f2da93 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -2203,12 +2203,12 @@ APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool) APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator, apr_pool_t *pool) { - apr_allocator_owner_set(allocator, *pool); + apr_allocator_owner_set(allocator, pool); } /* Deprecated */ -APR_DECLARE(apr_pool_t *pool) apr_allocator_get_owner( - apr_allocator_t *allocator); +APR_DECLARE(apr_pool_t *) apr_allocator_get_owner( + apr_allocator_t *allocator) { return apr_allocator_owner_get(allocator); } |