diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-04-27 19:25:35 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-04-27 19:25:35 +0000 |
| commit | 4653df411da208e245013f5e9a5895683a75012c (patch) | |
| tree | c7760da57819cc4c357ca6de98dd6fee14c15ca6 | |
| parent | 27bf484e98363620e1618827cbe8f206a4c9687a (diff) | |
| download | glibc-4653df411da208e245013f5e9a5895683a75012c.tar.gz glibc-4653df411da208e245013f5e9a5895683a75012c.tar.xz glibc-4653df411da208e245013f5e9a5895683a75012c.zip | |
Updated to fedora-glibc-20050427T1912
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/getcpuclockid.c | 11 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c | 6 |
5 files changed, 23 insertions, 10 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk index 222b4e6c51..0136e04b4b 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -1,5 +1,5 @@ # This file is updated automatically by Makefile. glibc-branch := fedora glibc-base := HEAD -fedora-sync-date := 2005-04-27 10:43 UTC -fedora-sync-tag := fedora-glibc-20050427T1043 +fedora-sync-date := 2005-04-27 19:12 UTC +fedora-sync-tag := fedora-glibc-20050427T1912 diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 40b40da957..175e4faffb 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2005-04-27 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/pthread/getcpuclockid.c: Include spinlock.h. + Fix a typo in kernel-posix-cpy-timers.h include name, use <> instead + of "" includes. + (pthread_getcpuclockid): Fix 2 typos. + 2005-04-27 Roland McGrath <roland@redhat.com> * sysdeps/pthread/getcpuclockid.c (pthread_getcpuclockid) diff --git a/linuxthreads/sysdeps/pthread/getcpuclockid.c b/linuxthreads/sysdeps/pthread/getcpuclockid.c index 117c22dd37..1c64e6c2be 100644 --- a/linuxthreads/sysdeps/pthread/getcpuclockid.c +++ b/linuxthreads/sysdeps/pthread/getcpuclockid.c @@ -1,5 +1,5 @@ /* pthread_getcpuclockid -- Get POSIX clockid_t for a pthread_t. Linux version - Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2004, 2005 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 @@ -22,8 +22,9 @@ #include <sys/time.h> #include <time.h> #include <internals.h> -#include "kernel-features.h" -#include "posix-cpu-timers.h" +#include <spinlock.h> +#include <kernel-features.h> +#include <kernel-posix-cpu-timers.h> #if !(__ASSUME_POSIX_CPU_TIMERS > 0) @@ -58,12 +59,12 @@ pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id) # if !(__ASSUME_POSIX_CPU_TIMERS > 0) # if !(__ASSUME_POSIX_TIMERS > 0) if (__libc_missing_posix_timers && !__libc_missing_posix_cpu_timers) - __libc_missing_cpu_posix_timers = 1; + __libc_missing_posix_cpu_timers = 1; # endif if (!__libc_missing_posix_cpu_timers) { INTERNAL_SYSCALL_DECL (err); - int r = INTERNAL_SYSCALL (clock_getres, err, 2, tidclock, NULL); + int r = INTERNAL_SYSCALL (clock_getres, err, 2, pidclock, NULL); if (!INTERNAL_SYSCALL_ERROR_P (r, err)) # endif { diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 790ceb01d0..8aa9b30468 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2005-04-27 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/pthread_getcpuclockid.c: Use <> instead + of "" includes. + 2005-04-27 Ulrich Drepper <drepper@redhat.com> * tst-cancel17.c (do_test): Add arbitrary factor to make sure diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c b/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c index 088b3392bc..82c2446d55 100644 --- a/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c +++ b/nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c @@ -1,5 +1,5 @@ /* pthread_getcpuclockid -- Get POSIX clockid_t for a pthread_t. Linux version - Copyright (C) 2000,2001,2002,2003,2004 Free Software Foundation, Inc. + Copyright (C) 2000,2001,2002,2003,2004,2005 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 @@ -21,8 +21,8 @@ #include <pthreadP.h> #include <sys/time.h> #include <tls.h> -#include "kernel-features.h" -#include "kernel-posix-cpu-timers.h" +#include <kernel-features.h> +#include <kernel-posix-cpu-timers.h> #if !(__ASSUME_POSIX_CPU_TIMERS > 0) |