From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 13 Apr 2000 15:13:26 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc_2-1-91~636
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=547ff46273e7460f79a51ecda370116969eba182;p=thirdparty%2Fglibc.git

Update.

2000-04-13  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/getcpuclockid.c
	(pthread_getcpuclockid): Fix typo.
---

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index d7c9b5f20f7..aabde7b4ceb 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/getcpuclockid.c
+	(pthread_getcpuclockid): Fix typo.
+
 2000-04-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* Makefile (libpthread-routines): Add getcpuclockid.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c b/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
index 2c4218acdc7..4fd99a3fde7 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
@@ -31,7 +31,7 @@ pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id)
     return EPERM;
 
   /* Store the number.  */
-  *clock_id = CLOCK_PTHREAD_CPUTIME_ID;
+  *clock_id = CLOCK_THREAD_CPUTIME_ID;
 
   return 0;
 }
diff --git a/posix/globtest.sh b/posix/globtest.sh
index 40d95d5dcbe..956a5e6bb1d 100755
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -240,7 +240,7 @@ if test ~/ = //; then
     echo / | cmp - $testout || result=1
 else
     echo ~/ | cmp - $testout || result=1
-endif
+fi
 
 # Test tilde expansion with username
 ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \