wrowe 2002/07/14 23:43:34
Modified: include apr_time.h
Log:
Remove the silly nsec manipulator, and add some msec manipulations that
win32 (at least) requires.
Revision Changes Path
1.55 +8 -3 apr/include/apr_time.h
Index: apr_time.h
===================================================================
RCS file: /home/cvs/apr/include/apr_time.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- apr_time.h 2 Jul 2002 15:47:12 -0000 1.54
+++ apr_time.h 15 Jul 2002 06:43:34 -0000 1.55
@@ -95,13 +95,18 @@
/** number of microseconds per second */
#define APR_USEC_PER_SEC APR_TIME_C(1000000)
-#define apr_time_usec(time) ((apr_int32_t)((time) % APR_USEC_PER_SEC))
+#define apr_time_sec(time) ((time) / APR_USEC_PER_SEC)
-#define apr_time_nsec(time) ((apr_int32_t)((time) % APR_USEC_PER_SEC) *
(apr_int32_t)1000)
+#define apr_time_usec(time) ((time) % APR_USEC_PER_SEC)
+
+#define apr_time_msec(time) (((time) / 1000) % 1000)
+
+
+#define apr_time_as_msec(time) ((time) / 1000)
-#define apr_time_sec(time) ((apr_int64_t)((time) / APR_USEC_PER_SEC))
#define apr_time_from_sec(sec) ((apr_time_t)(sec) * APR_USEC_PER_SEC)
+
#define apr_time_make(sec, usec) ((apr_time_t)(sec) * APR_USEC_PER_SEC \
+ (apr_time_t)(usec))
