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.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index cbc6df2..9dd2465 100644 (file)
--- 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 48c4e89..35bc21b 100644 (file)
--- 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)