diff options
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/linuxthreads.old/cancel.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/pthread.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old/wrapsyscall.c | 2 | ||||
| -rw-r--r-- | libpthread/nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | libpthread/nptl/pthreadP.h | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/pthread/pthread_once.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libpthread/linuxthreads.old/cancel.c b/libpthread/linuxthreads.old/cancel.c index 47534be66..0e5defb17 100644 --- a/libpthread/linuxthreads.old/cancel.c +++ b/libpthread/linuxthreads.old/cancel.c @@ -213,7 +213,7 @@ void __pthread_perform_cleanup(char *currentframe) } #ifndef __PIC__ -/* We need a hook to force the cancelation wrappers to be linked in when +/* We need a hook to force the cancellation wrappers to be linked in when static libpthread is used. */ extern const char __pthread_provide_wrappers; static const char *const __pthread_require_wrappers = diff --git a/libpthread/linuxthreads.old/pthread.c b/libpthread/linuxthreads.old/pthread.c index a8830b1a4..42e03f4dc 100644 --- a/libpthread/linuxthreads.old/pthread.c +++ b/libpthread/linuxthreads.old/pthread.c @@ -1159,7 +1159,7 @@ void __pthread_message(char * fmt, ...) #ifndef __PIC__ -/* We need a hook to force the cancelation wrappers to be linked in when +/* We need a hook to force the cancellation wrappers to be linked in when static libpthread is used. */ extern const char __pthread_provide_wrappers; static const char *const __pthread_require_wrappers = diff --git a/libpthread/linuxthreads.old/wrapsyscall.c b/libpthread/linuxthreads.old/wrapsyscall.c index 6e18388ca..e69ed6c8d 100644 --- a/libpthread/linuxthreads.old/wrapsyscall.c +++ b/libpthread/linuxthreads.old/wrapsyscall.c @@ -1,4 +1,4 @@ -/* Wrapper arpund system calls to provide cancelation points. +/* Wrapper arpund system calls to provide cancellation points. Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. diff --git a/libpthread/nptl/ChangeLog b/libpthread/nptl/ChangeLog index c81eb03b7..8ec6acde2 100644 --- a/libpthread/nptl/ChangeLog +++ b/libpthread/nptl/ChangeLog @@ -6717,7 +6717,7 @@ 2003-07-15 Ulrich Drepper <drepper@redhat.com> - * tst-tcancel-wrappers.sh: lseek and llseek are not cancelation points. + * tst-tcancel-wrappers.sh: lseek and llseek are not cancellation points. 2003-07-14 Ulrich Drepper <drepper@redhat.com> @@ -10990,7 +10990,7 @@ the static TLS block. (allocate_stack): Call _dl_allocate_tls_init for user-provided stack. - * cancellation.c: Renamed from cancelation.c. + * cancellation.c: Renamed from cancellation.c. * Makefile: Adjust accordingly. * pthreadP.h (CANCELLATION_P): Renamed from CANCELATION_P. * cleanup_defer.c: Use CANCELLATION_P. diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h index fb354eaa3..850562b1f 100644 --- a/libpthread/nptl/pthreadP.h +++ b/libpthread/nptl/pthreadP.h @@ -312,7 +312,7 @@ __do_cancel (void) # define LIBC_CANCEL_HANDLED() /* Nothing. */ #endif -/* The signal used for asynchronous cancelation. */ +/* The signal used for asynchronous cancellation. */ #define SIGCANCEL __SIGRTMIN diff --git a/libpthread/nptl/sysdeps/pthread/pthread_once.c b/libpthread/nptl/sysdeps/pthread/pthread_once.c index 57bb6b977..55131091a 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_once.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_once.c @@ -38,7 +38,7 @@ __pthread_once ( lll_lock (once_lock, LLL_PRIVATE); /* XXX This implementation is not complete. It doesn't take - cancelation and fork into account. */ + cancellation and fork into account. */ if (*once_control == PTHREAD_ONCE_INIT) { init_routine (); |