diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index d7c9b5f20f..aabde7b4ce 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2000-04-13 Ulrich Drepper + + * sysdeps/unix/sysv/linux/i386/getcpuclockid.c + (pthread_getcpuclockid): Fix typo. + 2000-04-12 Ulrich Drepper * 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 2c4218acdc..4fd99a3fde 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 40d95d5dcb..956a5e6bb1 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} \