aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--manual/time.texi29
2 files changed, 8 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ce90eb58a..1fa12aaf8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-02 Roland McGrath <roland@hack.frob.com>
+
+ [BZ #13792]
+ * manual/time.texi (Elapsed Time): Move timeval_subtract example
+ function to ...
+ * manual/timeval_subtract.c.texi: ... here, new file.
+
2012-03-02 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/fpu/libm-test-ulps: Update for recently added tests.
diff --git a/manual/time.texi b/manual/time.texi
index 78396f23e0..a2e11a1a9d 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -139,34 +139,7 @@ this. It works even on some peculiar operating systems where the
@code{tv_sec} member has an unsigned type.
@smallexample
-/* @r{Subtract the `struct timeval' values X and Y,}
- @r{storing the result in RESULT.}
- @r{Return 1 if the difference is negative, otherwise 0.} */
-
-int
-timeval_subtract (result, x, y)
- struct timeval *result, *x, *y;
-@{
- /* @r{Perform the carry for the later subtraction by updating @var{y}.} */
- if (x->tv_usec < y->tv_usec) @{
- int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
- y->tv_usec -= 1000000 * nsec;
- y->tv_sec += nsec;
- @}
- if (x->tv_usec - y->tv_usec > 1000000) @{
- int nsec = (x->tv_usec - y->tv_usec) / 1000000;
- y->tv_usec += 1000000 * nsec;
- y->tv_sec -= nsec;
- @}
-
- /* @r{Compute the time remaining to wait.}
- @r{@code{tv_usec} is certainly positive.} */
- result->tv_sec = x->tv_sec - y->tv_sec;
- result->tv_usec = x->tv_usec - y->tv_usec;
-
- /* @r{Return 1 if result is negative.} */
- return x->tv_sec < y->tv_sec;
-@}
+@include timeval_subtract.c.texi
@end smallexample
Common functions that use @code{struct timeval} are @code{gettimeofday}