qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* libio/libioP.h (_IO_acquire_lock_fct): Define as inline function.
This commit is contained in:
Ulrich Drepper 2003-08-31 20:53:32 +00:00
parent 38226fe3a6
commit eef80cf880
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -5,7 +5,7 @@
2003-08-31 Ulrich Drepper <drepper@redhat.com> 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. Code by Richard Henderson.
2003-08-31 Philip Blundell <philb@gnu.org> 2003-08-31 Philip Blundell <philb@gnu.org>

8
libio/libio.h
View File

@ -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; extern void _IO_free_wbackup_area (_IO_FILE *) __THROW;
#endif #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 #ifdef __cplusplus
} }
#endif #endif

9
libio/libioP.h
View File

@ -970,3 +970,12 @@ extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf;
#else #else
# define CHECK_FILE(FILE, RET) COERCE_FILE (FILE) # define CHECK_FILE(FILE, RET) COERCE_FILE (FILE)
#endif #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);
}

4
nptl/ChangeLog
View File

@ -1,5 +1,9 @@
2003-08-31 Ulrich Drepper <drepper@redhat.com> 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 * sysdeps/pthread/bits/libc-lock.h: Mark pthread_setcancelstate as
weak. weak.