aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-05 07:26:41 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-05 07:26:41 +0000
commit5e497a4142a2235c2a896ee6c9c6d72ee0571270 (patch)
treeee944640a02dfc5ebb6f553e23c2b4747a36e5c6
parent86a0c4fafbeb21f52b707f2f4b141d01594aeafb (diff)
downloadglibc-5e497a4142a2235c2a896ee6c9c6d72ee0571270.tar
glibc-5e497a4142a2235c2a896ee6c9c6d72ee0571270.tar.gz
glibc-5e497a4142a2235c2a896ee6c9c6d72ee0571270.tar.bz2
glibc-5e497a4142a2235c2a896ee6c9c6d72ee0571270.zip
Update.
2003-07-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/pthread/bits/libc-lock.h (__libc_cleanup_push): Renamed. Fix use of parameter. (__libc_cleanup_pop): Likewise.
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/pthread/bits/libc-lock.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index cbc6df2cc0..9dd2465d5b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-05 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/pthread/bits/libc-lock.h (__libc_cleanup_push): Renamed.
+ Fix use of parameter.
+ (__libc_cleanup_pop): Likewise.
+
2003-07-04 Ulrich Drepper <drepper@redhat.com>
* init.c (sigcancel_handler): Change parameters to match handler
diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h
index 48c4e89185..35bc21b95a 100644
--- a/nptl/sysdeps/pthread/bits/libc-lock.h
+++ b/nptl/sysdeps/pthread/bits/libc-lock.h
@@ -398,14 +398,14 @@ __libc_cleanup_routine (struct __pthread_cleanup_frame *f)
f->__cancel_routine (f->__cancel_arg);
}
-#define __pthread_cleanup_push(fct, arg) \
+#define __libc_cleanup_push(fct, arg) \
do { \
struct __pthread_cleanup_frame __clframe \
__attribute__ ((__cleanup__ (__libc_cleanup_routine))) \
- = { .__cancel_routine = (routine), .__cancel_arg = (arg), \
+ = { .__cancel_routine = (fct), .__cancel_arg = (arg), \
.__do_it = 1 };
-#define __pthread_cleanup_pop(execute) \
+#define __libc_cleanup_pop(execute) \
__clframe.__do_it = (execute); \
} while (0)