summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2002-03-05 19:43:35 +0000
committerbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2002-03-05 19:43:35 +0000
commit16d599158113cea90037bc272c59e5b7a598c848 (patch)
tree907e0fa1bab8b0871a7462175c682d13ff626812 /time
parent93c19702ed41114d62a2a8d8584dbfb8b39391de (diff)
downloadlibapr-16d599158113cea90037bc272c59e5b7a598c848.tar.gz
Removed the special implementation of the apr_time_now() API since we
now have gettimeofday() on NetWare. Also added a redefinition of the timezone macro. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63080 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'time')
-rw-r--r--time/unix/time.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/time/unix/time.c b/time/unix/time.c
index 92a3eece0..87c54e08e 100644
--- a/time/unix/time.c
+++ b/time/unix/time.c
@@ -110,16 +110,9 @@ APR_DECLARE(apr_status_t) apr_ansi_time_to_apr_time(apr_time_t *result,
/* NB NB NB NB This returns GMT!!!!!!!!!! */
APR_DECLARE(apr_time_t) apr_time_now(void)
{
-#ifdef NETWARE
- uint64_t usec;
-
- NXGetTime(NX_SINCE_1970, NX_USECONDS, &usec);
- return usec;
-#else
struct timeval tv;
gettimeofday(&tv, NULL);
return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec;
-#endif
}
static void explode_time(apr_exploded_time_t *xt, apr_time_t t,
@@ -312,7 +305,7 @@ APR_DECLARE(apr_status_t) apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2
APR_DECLARE(void) apr_netware_setup_time(void)
{
tzset();
- server_gmt_offset = -timezone;
+ server_gmt_offset = -TZONE;
}
#else
APR_DECLARE(void) apr_unix_setup_time(void)