Updated to fedora-glibc-20050427T1912

diff --git a/fedora/branch.mk b/fedora/branch.mk
index 222b4e6c51457e355d348ee2af19d23ef29ee3cb..0136e04b4ba4db870d25108b928e24cab0c53372 100644 (file)
--- 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 40b40da957b4bab40d02c36d8aa63fc12f421a29..175e4faffb38ac65abc1d0aa215edeb13b4c792e 100644 (file)
--- 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 117c22dd375443a2402fda356ae963702274a7e3..1c64e6c2be0fe2bd5ad7c98250f26db561d40750 100644 (file)
--- 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 790ceb01d0321013469e584a3bdf215efda90999..8aa9b304680c915095e67bf454376da846e21656 100644 (file)
--- 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 088b3392bc99b4bc2bdea8d73f27d607d2d093b7..82c2446d55d422e6c6033cf5e0a9d9cd886fadae 100644 (file)
--- 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)