brianp 2002/07/04 17:21:59
Modified: network_io/unix poll.c
network_io/beos poll.c
network_io/win32 poll.c
Log:
use new time conversion macros in place of APR_USEC_PER_SEC
Revision Changes Path
1.54 +2 -2 apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/poll.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- poll.c 20 Mar 2002 08:54:43 -0000 1.53
+++ poll.c 5 Jul 2002 00:21:59 -0000 1.54
@@ -289,8 +289,8 @@
tvptr = NULL;
}
else {
- tv.tv_sec = timeout / APR_USEC_PER_SEC;
- tv.tv_usec = timeout % APR_USEC_PER_SEC;
+ tv.tv_sec = apr_time_sec(timeout);
+ tv.tv_usec = apr_time_usec(timeout);
tvptr = &tv;
}
1.33 +2 -2 apr/network_io/beos/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apr/network_io/beos/poll.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- poll.c 1 May 2002 17:26:31 -0000 1.32
+++ poll.c 5 Jul 2002 00:21:59 -0000 1.33
@@ -166,8 +166,8 @@
tvptr = NULL;
}
else {
- tv.tv_sec = timeout / APR_USEC_PER_SEC;
- tv.tv_usec = timeout % APR_USEC_PER_SEC;
+ tv.tv_sec = apr_time_sec(timeout);
+ tv.tv_usec = apr_time_usec(timeout);
tvptr = &tv;
}
1.31 +2 -2 apr/network_io/win32/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/poll.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- poll.c 4 Jun 2002 04:50:44 -0000 1.30
+++ poll.c 5 Jul 2002 00:21:59 -0000 1.31
@@ -134,8 +134,8 @@
tvptr = NULL;
}
else {
- tv.tv_sec = (long)(timeout / APR_USEC_PER_SEC);
- tv.tv_usec = (long)(timeout % APR_USEC_PER_SEC);
+ tv.tv_sec = (long)apr_time_sec(timeout);
+ tv.tv_usec = (long)apr_time_usec(timeout);
tvptr = &tv;
}
rv = select(500, /* ignored on Windows */
