about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-07-18 03:21:59 +0000
committerRoland McGrath <roland@gnu.org>2005-07-18 03:21:59 +0000
commit45cd1d64a49e3ecd792f1701eced9da0c766c43d (patch)
tree5dde0ac39458d2e102f0ab150ecba8c8695c5673
parenta2b80b73ff96b37ecd06b03ddfa7cc0863f150f2 (diff)
downloadglibc-45cd1d64a49e3ecd792f1701eced9da0c766c43d.tar.gz
glibc-45cd1d64a49e3ecd792f1701eced9da0c766c43d.tar.xz
glibc-45cd1d64a49e3ecd792f1701eced9da0c766c43d.zip
2005-04-05 Jakub Jelinek <jakub@redhat.com>
	[BZ #1102]
	* sysdeps/pthread/pthread.h (__pthread_cleanup_routine): Use
	__inline instead of inline.
	* sysdeps/pthread/bits/libc-lock.h (__libc_cleanup_routine): Likewise.
-rw-r--r--nptl/sysdeps/pthread/bits/libc-lock.h2
-rw-r--r--nptl/sysdeps/pthread/pthread.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h
index 8310092e7e..3a51ab0dcc 100644
--- a/nptl/sysdeps/pthread/bits/libc-lock.h
+++ b/nptl/sysdeps/pthread/bits/libc-lock.h
@@ -408,7 +408,7 @@ extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer
 
 
 /* Normal cleanup handling, based on C cleanup attribute.  */
-extern inline void
+extern __inline void
 __libc_cleanup_routine (struct __pthread_cleanup_frame *f)
 {
   if (f->__do_it)
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 6662f4a5b1..92e66f7c72 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -532,7 +532,7 @@ class __pthread_cleanup_class
    function the compiler is free to decide inlining the change when
    needed or fall back on the copy which must exist somewhere
    else.  */
-extern inline void
+extern __inline void
 __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame)
 {
   if (__frame->__do_it)