diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-01-06 04:59:13 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-01-06 04:59:13 -0800 |
| commit | 57ada0e7e79b9421a77d2b92dffce0f9e8e087b5 (patch) | |
| tree | 194bb1f4abee3c29299c52ae825f6be8f356c43f /bits | |
| parent | 46abb64d6287d09100b147d062f6810066389b7e (diff) | |
| download | glibc-57ada0e7e79b9421a77d2b92dffce0f9e8e087b5.tar.gz | |
Define CLOCKS_PER_SEC type to the type clock_t
C99 specifies that CLOCKS_PER_SEC is an expression with the type clock_t.
This patch adds a generic <bits/time2.h> to define CLOCKS_PER_SEC and
provides the Linux/x86-64 version of <bits/time2.h> to support x32.
[BZ #17797]
* bits/time.h (CLOCKS_PER_SEC): Changed to ((clock_t) 1000000).
* sysdeps/unix/sysv/linux/bits/time.h (CLOCKS_PER_SEC): Likewise.
* sysdeps/unix/sysv/linux/clock.c (clock): _Static_assert
CLOCKS_PER_SEC == 1000000.
* time/clocktest.c (main): Replace %ld with %jd and cast to
intmax_t.
Diffstat (limited to 'bits')
| -rw-r--r-- | bits/time.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bits/time.h b/bits/time.h index ae17b7f802..7585ddf6e5 100644 --- a/bits/time.h +++ b/bits/time.h @@ -24,13 +24,13 @@ # ifndef _BITS_TIME_H # define _BITS_TIME_H 1 -/* ISO/IEC 9899:1990 7.12.1: <time.h> - The macro `CLOCKS_PER_SEC' is the number per second of the value - returned by the `clock' function. */ +/* ISO/IEC 9899:1999 7.23.1: Components of time + The macro `CLOCKS_PER_SEC' is an expression with type `clock_t' that is + the number per second of the value returned by the `clock' function. */ /* CAE XSH, Issue 4, Version 2: <time.h> The value of CLOCKS_PER_SEC is required to be 1 million on all XSI-conformant systems. */ -# define CLOCKS_PER_SEC 1000000l +# define CLOCKS_PER_SEC ((clock_t) 1000000) # if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK |