diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-23 06:03:42 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-23 06:03:42 +0000 |
| commit | c12aa8015699d66a193c3c183b4f1d1a72bb92c1 (patch) | |
| tree | a20c1864b74c8471aa7aaf675da180546b16c537 /linuxthreads/sysdeps/pthread/bits/stdio-lock.h | |
| parent | 8179dcc10808cf2a515cf19d445789193a763ec4 (diff) | |
| download | glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.tar glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.tar.gz glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.tar.bz2 glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.zip | |
* sysdeps/generic/ldsodefs.h (_dl_load_lock): Declare it here with
__libc_lock_define_recursive.
* elf/dl-open.c: Don't declare it here any more.
* elf/dl-close.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-iteratephdr.c: Likewise.
* elf/dl-lookup.c (add_dependency): Use __libc_lock_lock_recursive and
__libc_lock_unlock_recursive.
* elf/dl-close.c (_dl_close): Likewise
* elf/dl-iteratephdr.c (__dl_iterate_phdr): Likewise
* elf/dl-open.c (_dl_open): Likewise
* sysdeps/generic/bits/libc-lock.h
(__libc_lock_define_recursive): New macro.
* sysdeps/generic/bits/stdio-lock.h (_IO_lock_t): Use it.
(_IO_lock_lock): Use __libc_lock_lock_recursive.
(_IO_lock_unlock): Use __libc_lock_unlock_recursive.
Diffstat (limited to 'linuxthreads/sysdeps/pthread/bits/stdio-lock.h')
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/stdio-lock.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h index a1893c8bd1..4dc7dcfc52 100644 --- a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h @@ -17,12 +17,17 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <pthread.h> +#include <bits/libc-lock.h> -typedef pthread_mutex_t _IO_lock_t; +__libc_lock_define_recursive (typedef, _IO_lock_t) /* We need recursive (counting) mutexes. */ -#define _IO_lock_initializer PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +#define _IO_lock_initializer {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP} + +#define _IO_lock_init(_name) __libc_lock_init_recursive (_name) +#define _IO_lock_fini(_name) __libc_lock_fini_recursive (_name) +#define _IO_lock_lock(_name) __libc_lock_lock_recursive (_name) +#define _IO_lock_unlock(_name) __libc_lock_unlock_recursive (_name) #define _IO_cleanup_region_start(_fct, _fp) \ @@ -40,11 +45,3 @@ typedef pthread_mutex_t _IO_lock_t; } #define _IO_cleanup_region_end(_doit) \ __libc_cleanup_region_end (_doit) -#define _IO_lock_init(_name) \ - __libc_lock_init_recursive (_name) -#define _IO_lock_fini(_name) \ - __libc_lock_fini_recursive (_name) -#define _IO_lock_lock(_name) \ - __libc_lock_lock (_name) -#define _IO_lock_unlock(_name) \ - __libc_lock_unlock (_name) |