bnicholes 02/03/05 11:43:35
Modified: time/unix time.c
Log:
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.
Revision Changes Path
1.60 +1 -8 apr/time/unix/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apr/time/unix/time.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- time.c 10 Jan 2002 23:46:43 -0000 1.59
+++ time.c 5 Mar 2002 19:43:35 -0000 1.60
@@ -110,16 +110,9 @@
/* 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(void) apr_netware_setup_time(void)
{
tzset();
- server_gmt_offset = -timezone;
+ server_gmt_offset = -TZONE;
}
#else
APR_DECLARE(void) apr_unix_setup_time(void)
