From 44c51e9ab074bada216c5fcbc5e48d06ee24b80f Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 24 Apr 2001 05:40:23 +0000
Subject: [PATCH] Update.

	* sysdeps/generic/get_clockfreq.c (__get_clockfreq): Likewise.
---
 ChangeLog                             | 1 +
 linuxthreads/ChangeLog                | 4 ++++
 sysdeps/generic/clock_getcpuclockid.c | 1 +
 sysdeps/generic/get_clockfreq.c       | 6 +++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23a2bae52e..6639cb5821 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@
 
 	* sysdeps/unix/sysv/linux/i386/get_clockfreq.c (__get_clockfreq):
 	Use hp_timing_t type.
+	* sysdeps/generic/get_clockfreq.c (__get_clockfreq): Likewise.
 
 	* sysdeps/unix/sysv/linux/ia64/get_clockfreq.c: New file.
 
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 7225ec4ab6..8a18147927 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,9 @@
 2001-04-23  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/pthread/getcpuclockid.c: Make function generic, test
+	using #ifdef whether the clock is available.
+	* sysdeps/unix/sysv/linux/i386/getcpuclockid.c: Removed.
+
 	* sysdeps/ia64/Versions: New file.
 
 	* sysdeps/unix/sysv/linux/ia64/pt-initfini.c (_init): We don't
diff --git a/sysdeps/generic/clock_getcpuclockid.c b/sysdeps/generic/clock_getcpuclockid.c
index f39a8cf492..874f13e141 100644
--- a/sysdeps/generic/clock_getcpuclockid.c
+++ b/sysdeps/generic/clock_getcpuclockid.c
@@ -18,6 +18,7 @@
 
 #include <errno.h>
 #include <time.h>
+#include <unistd.h>
 
 int
 clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
diff --git a/sysdeps/generic/get_clockfreq.c b/sysdeps/generic/get_clockfreq.c
index 94f233c557..89af7fc013 100644
--- a/sysdeps/generic/get_clockfreq.c
+++ b/sysdeps/generic/get_clockfreq.c
@@ -1,5 +1,5 @@
 /* Get frequency of the system processor.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,10 @@
 
 #include <libc-internal.h>
 
-unsigned long long int
+hp_timing_t
 __get_clockfreq (void)
 {
   /* There is no generic way to find this out since we have in general
      no counter register either.  */
-  return 0ull;
+  return 0;
 }