diff options
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h | 7 | ||||
| -rw-r--r-- | nptl/ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/pthread_mutex_trylock.c | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index b2fad82521..952c703804 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2003-06-20 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Support cancellation + in librt. + 2003-06-21 Andreas Schwab <schwab@suse.de> * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Support cancellation @@ -5,7 +10,7 @@ 2003-06-20 Richard Henderson <rth@redhat.com> - * sysdeps/unix/sysv/linux/alpha/Makefile (libpthread-routines): + * sysdeps/unix/sysv/linux/alpha/Makefile (libpthread-routines): Remove ptw-osf_sigprocmask. 2003-06-18 Jakub Jelinek <jakub@redhat.com> diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index e6d0cca252..e7f2704b63 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -23,7 +23,7 @@ # include <linuxthreads/internals.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread +#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt # define _IMM12 #-12 # define _IMM16 #-16 @@ -92,10 +92,13 @@ # define __local_enable_asynccancel __pthread_enable_asynccancel # define __local_disable_asynccancel __pthread_disable_asynccancel # define __local_multiple_threads __pthread_multiple_threads -# else +# elif !defined NOT_IN_libc # define __local_enable_asynccancel __libc_enable_asynccancel # define __local_disable_asynccancel __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads +# else +# define __local_enable_asynccancel __librt_enable_asynccancel +# define __local_disable_asynccancel __librt_disable_asynccancel # endif # define CENABLE \ diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a39ae7eb7e..0c15dccfea 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2003-06-24 Roland McGrath <roland@redhat.com> + + * pthread_mutex_trylock.c (__pthread_mutex_trylock): Typo fix. + 2003-06-24 Ulrich Drepper <drepper@redhat.com> * pthreadP.h: Declare __find_thread_by_id. diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c index b164e0205e..7008af3d97 100644 --- a/nptl/pthread_mutex_trylock.c +++ b/nptl/pthread_mutex_trylock.c @@ -26,7 +26,7 @@ int __pthread_mutex_trylock (mutex) pthread_mutex_t *mutex; { - pid_t *id; + pid_t id; switch (__builtin_expect (mutex->__data.__kind, PTHREAD_MUTEX_TIMED_NP)) { |