diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | libio/libio.h | 8 | ||||
| -rw-r--r-- | libio/libioP.h | 9 | ||||
| -rw-r--r-- | nptl/ChangeLog | 4 |
4 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 05a6dcad6c..939f9f1203 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ 2003-08-31 Ulrich Drepper <drepper@redhat.com> - * libio/libio.h (_IO_acquire_lock_fct): Define as inline function. + * libio/libioP.h (_IO_acquire_lock_fct): Define as inline function. Code by Richard Henderson. 2003-08-31 Philip Blundell <philb@gnu.org> diff --git a/libio/libio.h b/libio/libio.h index af74793369..11274aebb4 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -516,14 +516,6 @@ extern _IO_ssize_t _IO_wpadn (_IO_FILE *, wint_t, _IO_ssize_t) __THROW; extern void _IO_free_wbackup_area (_IO_FILE *) __THROW; #endif -static inline void -_IO_acquire_lock_fct (_IO_FILE **p) -{ - _IO_FILE *fp = *p; - if ((fp->_flags & _IO_USER_LOCK) == 0) - _IO_funlockfile (fp); -} - #ifdef __cplusplus } #endif diff --git a/libio/libioP.h b/libio/libioP.h index 1d30eef5cd..1e66feaa78 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -970,3 +970,12 @@ extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf; #else # define CHECK_FILE(FILE, RET) COERCE_FILE (FILE) #endif + +static inline void +__attribute__ ((__always_inline__)) +_IO_acquire_lock_fct (_IO_FILE **p) +{ + _IO_FILE *fp = *p; + if ((fp->_flags & _IO_USER_LOCK) == 0) + _IO_funlockfile (fp); +} diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 6d04d99107..2bf051082d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,9 @@ 2003-08-31 Ulrich Drepper <drepper@redhat.com> + * sysdeps/pthread/bits/stdio-lock.h (_IO_acquire_lock): Avoid + nested function, use static inline function from libio.h. + Code by Richard Henderson. + * sysdeps/pthread/bits/libc-lock.h: Mark pthread_setcancelstate as weak. |