diff options
| author | Roland McGrath <roland@gnu.org> | 1996-01-17 02:03:00 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-01-17 02:03:00 +0000 |
| commit | 7176f4e4b5ffc9765f3a43c53bc2f96cc3909700 (patch) | |
| tree | bb8efb5c93c4fdae80f48c42c0742d738888641f /sysdeps/unix/bsd/clock.c | |
| parent | b17178fc56b52ad4d251b9286365f6da60c860e6 (diff) | |
| download | glibc-7176f4e4b5ffc9765f3a43c53bc2f96cc3909700.tar glibc-7176f4e4b5ffc9765f3a43c53bc2f96cc3909700.tar.gz glibc-7176f4e4b5ffc9765f3a43c53bc2f96cc3909700.tar.bz2 glibc-7176f4e4b5ffc9765f3a43c53bc2f96cc3909700.zip | |
* misc/efgcvt_r.c (ecvt_r): Handle negative values.
* stdlib/stdlib.h: Replace __CONSTVALUE by attribute.
* stdlib/abs.c, stdlib/div.c, stdlib/labs.c, stdlib/ldiv.c,
sysdeps/generic/hypot.c: Remove obsolete __CONSTVALUE.
* stdio-common/printf_fp.c (__printf_fp): Fix parameter
declaration.
* sysdeps/generic/putenv.c (putenv): Fix second argument of
setenv.
* sysdeps/ieee754/hypot.c: New file, extracted out of cabs.c.
* sysdeps/ieee754/cabs.c: Don't define hypot here.
* sysdeps/ieee754/ieee754.h (union ieee854_long_double): Fix
definition of ieee_nan alternative.
* sysdeps/m68k/__longjmp.c, sysdeps/m68k/setjmp.c: Add register
prefix spec.
* sysdeps/m68k/ffs.c (ffs): Fix register constraint.
* sysdeps/m68k/fpu/__math.h: Include <errno.h>. Replace obsolete
__CONSTVALUE by attribute.
(floor): Round to negative infinity.
(rint, expm1) [__NO_MATH_INLINES]: Don't define, to avoid type
clash when compiling source.
(pow): Handle x == 0 and x < 0.
(ceil, __isinf, __isnan): Fix register constraints.
(__isinfl, __isnanl): Added.
* sysdeps/m68k/fpu/acos.c, sysdeps/m68k/fpu/atan2.c,
sysdeps/m68k/fpu/fmod.c, sysdeps/m68k/fpu/ldexp.c,
sysdeps/m68k/fpu/pow.c: Remove obsolete __CONSTVALUE.
* sysdeps/m68k/bsd-_setjmp.S, sysdeps/m68k/bsd-setjmp.S: Fix
assembler syntax.
* sysdeps/unix/bsd/bsd4.4/fchdir.S (fchdir): Take only one
argument.
* sysdeps/unix/bsd/clock.c (timeval_to_clock_t): Fix timeval to
clock_t conversion.
(clock): Don't multiply by CLOCKS_PER_SEC.
* sysdeps/unix/bsd/poll.c (poll): Fix msec to timeval conversion.
* sysdeps/unix/bsd/sun/m68k/brk.S (brk): Compare with address of
__end.
* sysdeps/unix/bsd/sun/m68k/vfork.S: Fix assembler syntax.
* sysdeps/unix/bsd/ualarm.c (ualarm): Fix timeval calculation.
* sysdeps/unix/bsd/vax/vfork.S: Remove duplicate label.
Diffstat (limited to 'sysdeps/unix/bsd/clock.c')
| -rw-r--r-- | sysdeps/unix/bsd/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/bsd/clock.c b/sysdeps/unix/bsd/clock.c index 2c3e028444..d8fd2749cc 100644 --- a/sysdeps/unix/bsd/clock.c +++ b/sysdeps/unix/bsd/clock.c @@ -28,7 +28,7 @@ static clock_t DEFUN(timeval_to_clock_t, (tv), CONST struct timeval *tv) { return (clock_t) ((tv->tv_sec * CLK_TCK) + - (tv->tv_usec * CLK_TCK / 1000)); + (tv->tv_usec * CLK_TCK / 1000000)); } /* Return the time used by the program so far (user time + system time). */ @@ -41,5 +41,5 @@ DEFUN_VOID(clock) return (clock_t) -1; return (timeval_to_clock_t(&usage.ru_stime) + - timeval_to_clock_t(&usage.ru_utime)) * CLOCKS_PER_SEC; + timeval_to_clock_t(&usage.ru_utime)); } |