diff options
| author | Ian Holsman <ianh@apache.org> | 2002-03-06 17:50:02 +0000 |
|---|---|---|
| committer | Ian Holsman <ianh@apache.org> | 2002-03-06 17:50:02 +0000 |
| commit | 9d4d0aafd3e57e44da763bc3ce3d1ea4bf702df0 (patch) | |
| tree | 485eb7b0904de93e2033f45b265f444ed18a4bd9 /time/win32 | |
| parent | 2a77a5529d154dc11d46b81ad2cdc3862d1ee05b (diff) | |
| download | apr-9d4d0aafd3e57e44da763bc3ce3d1ea4bf702df0.tar.gz | |
patches for apr to rename apr_ansi_time_to_apr_time and
apr_exploded_time_t.
PR:
Obtained from:
Submitted by: Thom May <thom@planetarytramp.org>
Reviewed by: Ian Holsman
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63090 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'time/win32')
| -rw-r--r-- | time/win32/time.c | 18 | ||||
| -rw-r--r-- | time/win32/timestr.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/time/win32/time.c b/time/win32/time.c index 9d46ecccf..b43449c5e 100644 --- a/time/win32/time.c +++ b/time/win32/time.c @@ -71,7 +71,7 @@ */ #define IsLeapYear(y) ((!(y % 4)) ? (((!(y % 400)) && (y % 100)) ? 1 : 0) : 0) -static void SystemTimeToAprExpTime(apr_exploded_time_t *xt, SYSTEMTIME *tm, BOOL lt) +static void SystemTimeToAprExpTime(apr_time_exp_t *xt, SYSTEMTIME *tm, BOOL lt) { TIME_ZONE_INFORMATION tz; DWORD rc; @@ -123,7 +123,7 @@ static void SystemTimeToAprExpTime(apr_exploded_time_t *xt, SYSTEMTIME *tm, BOOL return; } -APR_DECLARE(apr_status_t) apr_ansi_time_to_apr_time(apr_time_t *result, +APR_DECLARE(apr_status_t) apr_time_ansi_put(apr_time_t *result, time_t input) { *result = (apr_time_t) input * APR_USEC_PER_SEC; @@ -146,7 +146,7 @@ APR_DECLARE(apr_time_t) apr_time_now(void) return aprtime; } -APR_DECLARE(apr_status_t) apr_explode_gmt(apr_exploded_time_t *result, +APR_DECLARE(apr_status_t) apr_explode_gmt(apr_time_exp_t *result, apr_time_t input) { FILETIME ft; @@ -158,7 +158,7 @@ APR_DECLARE(apr_status_t) apr_explode_gmt(apr_exploded_time_t *result, return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_explode_time(apr_exploded_time_t *result, +APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result, apr_time_t input, apr_int32_t offs) { FILETIME ft; @@ -171,7 +171,7 @@ APR_DECLARE(apr_status_t) apr_explode_time(apr_exploded_time_t *result, return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_explode_localtime(apr_exploded_time_t *result, +APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result, apr_time_t input) { SYSTEMTIME st; @@ -186,7 +186,7 @@ APR_DECLARE(apr_status_t) apr_explode_localtime(apr_exploded_time_t *result, } APR_DECLARE(apr_status_t) apr_implode_time(apr_time_t *t, - apr_exploded_time_t *xt) + apr_time_exp_t *xt) { int year; time_t days; @@ -221,7 +221,7 @@ APR_DECLARE(apr_status_t) apr_implode_time(apr_time_t *t, } APR_DECLARE(apr_status_t) apr_implode_gmt(apr_time_t *t, - apr_exploded_time_t *xt) + apr_time_exp_t *xt) { apr_status_t status = apr_implode_time(t, xt); if (status == APR_SUCCESS) @@ -238,7 +238,7 @@ APR_DECLARE(apr_status_t) apr_os_imp_time_get(apr_os_imp_time_t **ostime, } APR_DECLARE(apr_status_t) apr_os_exp_time_get(apr_os_exp_time_t **ostime, - apr_exploded_time_t *aprexptime) + apr_time_exp_t *aprexptime) { (*ostime)->wYear = aprexptime->tm_year + 1900; (*ostime)->wMonth = aprexptime->tm_mon + 1; @@ -261,7 +261,7 @@ APR_DECLARE(apr_status_t) apr_os_imp_time_put(apr_time_t *aprtime, return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_os_exp_time_put(apr_exploded_time_t *aprtime, +APR_DECLARE(apr_status_t) apr_os_exp_time_put(apr_time_exp_t *aprtime, apr_os_exp_time_t **ostime, apr_pool_t *cont) { diff --git a/time/win32/timestr.c b/time/win32/timestr.c index b30440e4b..7b6969fa2 100644 --- a/time/win32/timestr.c +++ b/time/win32/timestr.c @@ -67,7 +67,7 @@ APR_DECLARE_DATA const char apr_day_snames[7][4] = APR_DECLARE(apr_status_t) apr_rfc822_date(char *date_str, apr_time_t t) { - apr_exploded_time_t xt; + apr_time_exp_t xt; const char *s; int real_year; @@ -115,7 +115,7 @@ APR_DECLARE(apr_status_t) apr_rfc822_date(char *date_str, apr_time_t t) APR_DECLARE(apr_status_t) apr_ctime(char *date_str, apr_time_t t) { - apr_exploded_time_t xt; + apr_time_exp_t xt; const char *s; int real_year; @@ -220,7 +220,7 @@ int win32_strftime_extra(char *s, size_t max, const char *format, APR_DECLARE(apr_status_t) apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, const char *format, - apr_exploded_time_t *xt) + apr_time_exp_t *xt) { struct tm tm; memset(&tm, 0, sizeof tm); |