diff options
| author | Roland McGrath <roland@gnu.org> | 2005-04-05 21:33:41 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-04-05 21:33:41 +0000 |
| commit | 328a48c5791aa2fd4ca223e8d75e923382656663 (patch) | |
| tree | fd75398cb30ce708cfe25ca458917e4801903b9c | |
| parent | 9a79284e48dcca1b72bdef10eedd9c838c205426 (diff) | |
| download | glibc-328a48c5791aa2fd4ca223e8d75e923382656663.tar.gz glibc-328a48c5791aa2fd4ca223e8d75e923382656663.tar.xz glibc-328a48c5791aa2fd4ca223e8d75e923382656663.zip | |
2005-04-05 Jakub Jelinek <jakub@redhat.com>
* 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.h | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h index 8310092e7e..795caa7135 100644 --- a/nptl/sysdeps/pthread/bits/libc-lock.h +++ b/nptl/sysdeps/pthread/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. NPTL version. - Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -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 57024e1e84..18ece7096f 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -527,7 +527,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) |