[Glibc-bsd-commits] r5835 - trunk/glibc-ports/kfreebsd/bits

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-11-20 22:47:39 +0000 (Fri, 20 Nov 2015)
New Revision: 5835

Modified:
   trunk/glibc-ports/kfreebsd/bits/time.h
Log:
Merge from upstream:

commit 57ada0e7e79b9421a77d2b92dffce0f9e8e087b5
Author: H.J. Lu <hjl.tools at gmail.com>
Date:   Tue Jan 6 04:59:13 2015 -0800

    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.



Modified: trunk/glibc-ports/kfreebsd/bits/time.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/time.h	2015-11-20 21:53:49 UTC (rev 5834)
+++ trunk/glibc-ports/kfreebsd/bits/time.h	2015-11-20 22:47:39 UTC (rev 5835)
@@ -31,7 +31,7 @@
 /* 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) 1000000l)
 
 #  if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K
 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK