diff options
author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-06-01 00:28:28 +0000 |
---|---|---|
committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-06-01 00:28:28 +0000 |
commit | 11e122bcab483b9969bd7bff2ceef6bde4f41f92 (patch) | |
tree | 51880abe67af3ce106fc0627593d61c35b3e5f00 | |
parent | 329009307dff0eed71137c43a684d2d4e7e75372 (diff) | |
download | libapr-11e122bcab483b9969bd7bff2ceef6bde4f41f92.tar.gz |
SystemTimeToTzSpecificLocalTime is not implemented on Windows CE and is used in
the conversion of an APR time to an expanded local time. The APR code did have
fallback code for Win9x which did not call this function. The fallback code had
the deficiency of using the current offset for daylight savings time, not the
offset at the specified time.
PR: 39856
Submitted by: Curt Arnold <carnold apache.org>
Reviewed by: Davi Arnaut
Backport: 543340
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@543341 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | time/win32/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/time/win32/time.c b/time/win32/time.c index f37549cef..bf1dc5c7b 100644 --- a/time/win32/time.c +++ b/time/win32/time.c @@ -139,7 +139,7 @@ APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result, AprTimeToFileTime(&ft, input); -#if APR_HAS_UNICODE_FS +#if APR_HAS_UNICODE_FS && !defined(_WIN32_WCE) IF_WIN_OS_IS_UNICODE { TIME_ZONE_INFORMATION *tz; @@ -178,7 +178,7 @@ APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result, - (-(tz->Bias + tz->StandardBias) / 60); } #endif -#if APR_HAS_ANSI_FS +#if APR_HAS_ANSI_FS || defined(_WIN32_WCE) ELSE_WIN_OS_IS_ANSI { TIME_ZONE_INFORMATION tz; |