Update.

	* pthreadP.h: Enable pthread_cleanup_{push,pop} optimizations only
	inside libpthread.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b97c5120c887179fd3f5bb78977802afd5906836..a1152ea1a51c98340ab47d6b5d4f5110915cd589 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2002-12-08  Ulrich Drepper  <drepper@redhat.com>
 
+       * pthreadP.h: Enable pthread_cleanup_{push,pop} optimizations only
+       inside libpthread.
+
        * pt-fcntl.c (__fcntl): Initialize oldtype to avoid warning.
 
        * pthreadP.h: Declare __pthread_enable_asynccancel and

diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index c90b782722ebfd451ead87463a7fa5d92c95f3f2..4fba194108c26cc682ac30f6589267624e2fb430 100644 (file)
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -190,19 +190,21 @@ extern int __pthread_setcanceltype (int type, int *oldtype);
 extern int __pthread_enable_asynccancel (void) attribute_hidden;
 extern void __pthread_disable_asynccancel (int oldtype) attribute_hidden;
 
+#ifdef IS_IN_libpthread
 /* Special versions which use non-exported functions.  */
 extern void _GI_pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,
                                      void (*routine) (void *), void *arg)
      attribute_hidden;
-#undef pthread_cleanup_push
-#define pthread_cleanup_push(routine,arg) \
+# undef pthread_cleanup_push
+# define pthread_cleanup_push(routine,arg) \
   { struct _pthread_cleanup_buffer _buffer;                                  \
     _GI_pthread_cleanup_push (&_buffer, (routine), (arg));
 
 extern void _GI_pthread_cleanup_pop (struct _pthread_cleanup_buffer *buffer,
                                     int execute) attribute_hidden;
-#undef pthread_cleanup_pop
-#define pthread_cleanup_pop(execute) \
+# undef pthread_cleanup_pop
+# define pthread_cleanup_pop(execute) \
     _GI_pthread_cleanup_pop (&_buffer, (execute)); }
+#endif
 
 #endif /* pthreadP.h */