about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-07-24 20:18:57 +0000
committerUlrich Drepper <drepper@redhat.com>2004-07-24 20:18:57 +0000
commit15ef4b555f5bef9bbcb39bf72f8399d77e57afff (patch)
treeaf246a3f8088eac40172a5804c8b7f976112682f
parent06bfee07cbd94b28c62bbdea7a982dfdbd460b2c (diff)
downloadglibc-15ef4b555f5bef9bbcb39bf72f8399d77e57afff.tar.gz
glibc-15ef4b555f5bef9bbcb39bf72f8399d77e57afff.tar.xz
glibc-15ef4b555f5bef9bbcb39bf72f8399d77e57afff.zip
[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.
-rw-r--r--linuxthreads/ChangeLog6
-rw-r--r--linuxthreads/sysdeps/pthread/pthread.h2
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/pthread/pthread.h2
4 files changed, 14 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 2fa486a502..f2507ae9d9 100644
--- 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 95a10cb366..c4a5f2caac 100644
--- 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 b24fde12a7..85a063f011 100644
--- 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 8fb6cc741d..f5e9167a6b 100644
--- 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