about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-06-25 03:22:03 +0000
committerRoland McGrath <roland@gnu.org>2003-06-25 03:22:03 +0000
commiteef4a9f3e1ca45870649c2b133e2097c607770e3 (patch)
treeee3a4ed68fdb080f8a8469ebf961d9f5de615800 /nptl
parent1775abf061fd7a1868bb7e38fad8cb0a27f443fb (diff)
downloadglibc-eef4a9f3e1ca45870649c2b133e2097c607770e3.tar.gz
glibc-eef4a9f3e1ca45870649c2b133e2097c607770e3.tar.xz
glibc-eef4a9f3e1ca45870649c2b133e2097c607770e3.zip
* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Support cancellation
	in librt.

	* sysdeps/unix/sysv/linux/alpha/Makefile (libpthread-routines):
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/pthread_mutex_trylock.c2
2 files changed, 5 insertions, 1 deletions
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))
     {