This commit is contained in:
Jakub Jelinek 2004-10-05 15:24:37 +00:00
parent 7e89ca471a
commit 1c1864e245

View File

@ -1419,8 +1419,19 @@
VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee) VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee)
--- glibc-20041005T0745/nptl/ChangeLog 4 Oct 2004 20:51:25 -0000 1.715 --- glibc-20041005T0745/nptl/ChangeLog 4 Oct 2004 20:51:25 -0000 1.715
+++ glibc-20041005T0745-fedora/nptl/ChangeLog 5 Oct 2004 08:25:21 -0000 1.706.2.6 +++ glibc-20041005T0745-fedora/nptl/ChangeLog 5 Oct 2004 15:10:07 -0000 1.706.2.7
@@ -197,6 +197,11 @@ @@ -1,3 +1,10 @@
+2004-10-05 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/pthread/timer_create.c (timer_create): Use
+ defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0 instead of
+ defined CLOCK_PROCESS_CPUTIME_ID #ifs and similarly for
+ THREAD_CPUTIME.
+
2004-10-04 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Define _POSIX_CPUTIME
@@ -197,6 +204,11 @@
Move definition inside libpthread, libc, librt check. Provide Move definition inside libpthread, libc, librt check. Provide
definition for rtld. definition for rtld.
@ -1432,7 +1443,7 @@
2004-09-02 Ulrich Drepper <drepper@redhat.com> 2004-09-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
@@ -2271,6 +2276,11 @@ @@ -2271,6 +2283,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@ -1624,6 +1635,36 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, 59 Temple Place - Suite 330, write to the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041005T0745/nptl/sysdeps/pthread/timer_create.c 4 Oct 2004 20:50:53 -0000 1.6
+++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/timer_create.c 5 Oct 2004 15:10:09 -0000 1.5.2.2
@@ -38,10 +38,10 @@ timer_create (clock_id, evp, timerid)
struct thread_node *thread = NULL;
if (0
-#ifdef CLOCK_PROCESS_CPUTIME_ID
+#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
|| clock_id == CLOCK_PROCESS_CPUTIME_ID
#endif
-#ifdef CLOCK_THREAD_CPUTIME_ID
+#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
|| clock_id == CLOCK_THREAD_CPUTIME_ID
#endif
)
@@ -100,12 +100,12 @@ timer_create (clock_id, evp, timerid)
default:
thread = &__timer_signal_thread_rclk;
break;
-#ifdef CLOCK_PROCESS_CPUTIME_ID
+#if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
case CLOCK_PROCESS_CPUTIME_ID:
thread = &__timer_signal_thread_pclk;
break;
#endif
-#ifdef CLOCK_THREAD_CPUTIME_ID
+#if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
case CLOCK_THREAD_CPUTIME_ID:
thread = &__timer_signal_thread_tclk;
break;
--- glibc-20041005T0745/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 --- glibc-20041005T0745/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17
+++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1 +++ glibc-20041005T0745-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@