From a8f7ab98e29f2b17cdf7d94b6c6c8efed0e24c17 Mon Sep 17 00:00:00 2001 From: wrowe Date: Sat, 8 Jun 2002 20:04:26 +0000 Subject: Revert bogusness by providing proper stubs for functions that existed since the first indirect APR release [APACHE_2_0_35]. Fortunately, these appear to be the only bogusness detected between _35 and _36, and _37 must follow suit with stubs for newly deprecated symbols. Of course all stubs fall out with 1.0.0, which I picture Apache adopting with stronger version controls in APACHE_2_1_x, but we will see what concensus each project adopts between now and then. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63475 13f79535-47bb-0310-9956-ffa450edef68 --- include/apr_compat.h | 9 --------- include/apr_time.h | 9 +++++++++ include/apr_user.h | 8 +++++++- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/apr_compat.h b/include/apr_compat.h index a82cdc239..23a307ae0 100644 --- a/include/apr_compat.h +++ b/include/apr_compat.h @@ -11,15 +11,6 @@ * @{ */ -/* changes between APACHE_2_0_35 and APACHE_2_0_36 */ - -/** @deprecated @see apr_time_exp_tz */ -#define apr_explode_time apr_time_exp_tz -/** @deprecated @see apr_time_exp_lt */ -#define apr_explode_localtime apr_time_exp_lt -/** @deprecated @see apr_group_name_get */ -#define apr_get_groupname apr_group_name_get - /* redefine 1.3.x symbols to those that now live in libapr */ /** @see APR_INLINE */ diff --git a/include/apr_time.h b/include/apr_time.h index 8b60133ea..a630abd9f 100644 --- a/include/apr_time.h +++ b/include/apr_time.h @@ -153,6 +153,11 @@ APR_DECLARE(apr_status_t) apr_time_exp_tz(apr_time_exp_t *result, apr_time_t input, apr_int32_t offs); +/** @deprecated @see apr_time_exp_tz */ +APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result, + apr_time_t input, + apr_int32_t offs); + /** * convert a time to its human readable components in GMT timezone * @param result the exploded time @@ -167,6 +172,10 @@ APR_DECLARE(apr_status_t) apr_time_exp_gmt(apr_time_exp_t *result, * @param input the time to explode */ APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result, + apr_time_t input); + +/** @deprecated @see apr_time_exp_lt */ +APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result, apr_time_t input); /** diff --git a/include/apr_user.h b/include/apr_user.h index 3cc99e0db..cda0d7c0b 100644 --- a/include/apr_user.h +++ b/include/apr_user.h @@ -154,7 +154,13 @@ APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right); * @param p The pool from which to allocate the string * @remark This function is available only if APR_HAS_USER is defined. */ -APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p); +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); /** * Get the groupid for a specified group name -- cgit v1.2.1