[BZ #284]

Update.
2004-07-23  Jakub Jelinek  <jakub@redhat.com>

	[BZ #284]
	* sysdeps/pthread/pthread.h (pthread_getcpuclockid): Use __clockid_t
	instead of clockid_t.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 2fa486a..f2507ae 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-23  Jakub Jelinek  <jakub@redhat.com>
+
+       [BZ #284]
+       * sysdeps/pthread/pthread.h (pthread_getcpuclockid): Use __clockid_t
+       instead of clockid_t.
+
 2004-07-21  Roland McGrath  <roland@redhat.com>
 
        * Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).

diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h
index 95a10cb..c4a5f2c 100644 (file)
--- a/linuxthreads/sysdeps/pthread/pthread.h
+++ b/linuxthreads/sysdeps/pthread/pthread.h
@@ -648,7 +648,7 @@ extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buff
 #ifdef __USE_XOPEN2K
 /* Get ID of CPU-time clock for thread THREAD_ID.  */
 extern int pthread_getcpuclockid (pthread_t __thread_id,
-                                 clockid_t *__clock_id) __THROW;
+                                 __clockid_t *__clock_id) __THROW;
 #endif
 
 

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b24fde1..85a063f 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-23  Jakub Jelinek  <jakub@redhat.com>
+
+       [BZ #284]
+       * sysdeps/pthread/pthread.h (pthread_getcpuclockid): Use __clockid_t
+       instead of clockid_t.
+
 2004-07-21  Roland McGrath  <roland@redhat.com>
 
        * Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).

diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 8fb6cc7..f5e9167 100644 (file)
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -915,7 +915,7 @@ extern int pthread_setspecific (pthread_key_t __key,
 #ifdef __USE_XOPEN2K
 /* Get ID of CPU-time clock for thread THREAD_ID.  */
 extern int pthread_getcpuclockid (pthread_t __thread_id,
-                                 clockid_t *__clock_id) __THROW;
+                                 __clockid_t *__clock_id) __THROW;
 #endif