about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/i386/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/time.h3
6 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4db22065bd..ef46b97215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2000-11-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/bits/time.h (CLK_TCK): Cast sysconf result
+	to __clock_t.
+	* sysdeps/unix/sysv/linux/alpha/bits/time.h: Likewise.
+	* sysdeps/unix/sysv/linux/i386/bits/time.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/time.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/time.h: Likewise.
+
 	* sysdeps/unix/sysv/linux/bits/socket.h (CMSG_ALIGN): Cast result
 	of unary ~ to size_t.Update.
 
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/time.h b/sysdeps/unix/sysv/linux/alpha/bits/time.h
index b9d9f3f8d5..93c01c09c0 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/time.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/time.h
@@ -36,8 +36,9 @@
 #  ifndef __STRICT_ANSI__
 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
    presents the real value for clock ticks per second for the system.  */
+#   include <bits/types.h>
 extern long int __sysconf (int);
-#   define CLK_TCK (__sysconf (2))	/* 2 is _SC_CLK_TCK */
+#   define CLK_TCK ((__clock_t) __sysconf (2))	/* 2 is _SC_CLK_TCK */
 #  endif
 
 #  ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h
index a19b2a8760..1e31d8e08f 100644
--- a/sysdeps/unix/sysv/linux/bits/time.h
+++ b/sysdeps/unix/sysv/linux/bits/time.h
@@ -36,8 +36,9 @@
 #  ifndef __STRICT_ANSI__
 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
    presents the real value for clock ticks per second for the system.  */
+#   include <bits/types.h>
 extern long int __sysconf (int);
-#   define CLK_TCK (__sysconf (2))	/* 2 is _SC_CLK_TCK */
+#   define CLK_TCK ((__clock_t) __sysconf (2))	/* 2 is _SC_CLK_TCK */
 #  endif
 
 #  ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/i386/bits/time.h b/sysdeps/unix/sysv/linux/i386/bits/time.h
index 3b9e9d31a4..99b3191f38 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/time.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/time.h
@@ -36,8 +36,9 @@
 #  ifndef __STRICT_ANSI__
 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
    presents the real value for clock ticks per second for the system.  */
+#   include <bits/types.h>
 extern long int __sysconf (int);
-#   define CLK_TCK (__sysconf (2))	/* 2 is _SC_CLK_TCK */
+#   define CLK_TCK ((__clock_t) __sysconf (2))	/* 2 is _SC_CLK_TCK */
 #  endif
 
 #  ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/time.h b/sysdeps/unix/sysv/linux/ia64/bits/time.h
index 636e087cd6..4b0060daf1 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/time.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/time.h
@@ -36,8 +36,9 @@
 #  ifndef __STRICT_ANSI__
 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
    presents the real value for clock ticks per second for the system.  */
+#   include <bits/types.h>
 extern long int __sysconf (int);
-#   define CLK_TCK (__sysconf (2))	/* 2 is _SC_CLK_TCK */
+#   define CLK_TCK ((__clock_t) __sysconf (2))	/* 2 is _SC_CLK_TCK */
 #  endif
 
 #  ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/s390/bits/time.h b/sysdeps/unix/sysv/linux/s390/bits/time.h
index ca223b43fc..88fe006559 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/time.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/time.h
@@ -36,8 +36,9 @@
 #  ifndef __STRICT_ANSI__
 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
    presents the real value for clock ticks per second for the system.  */
+#   include <bits/types.h>
 extern long int __sysconf (int);
-#   define CLK_TCK (__sysconf (2))	/* 2 is _SC_CLK_TCK */
+#   define CLK_TCK ((__clock_t) __sysconf (2))	/* 2 is _SC_CLK_TCK */
 #  endif
 
 #  ifdef __USE_POSIX199309