From 5a13dcba58b0f6fc9d627bf3f982d8fbec9c1be4 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 14 Nov 2001 07:37:43 +0000 Subject: Sync up mipsel headers --- libc/sysdeps/linux/mips/bits/stdio-lock.h | 60 ++++++++++++++++--------------- 1 file changed, 32 insertions(+), 28 deletions(-) (limited to 'libc/sysdeps/linux/mips/bits/stdio-lock.h') diff --git a/libc/sysdeps/linux/mips/bits/stdio-lock.h b/libc/sysdeps/linux/mips/bits/stdio-lock.h index 42c219624..5b1c1b082 100644 --- a/libc/sysdeps/linux/mips/bits/stdio-lock.h +++ b/libc/sysdeps/linux/mips/bits/stdio-lock.h @@ -1,44 +1,48 @@ -/* Thread package specific definitions of stream lock type. - Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +/* Thread package specific definitions of stream lock type. Generic version. + Copyright (C) 2000, 2001 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ -#include +#ifndef _BITS_STDIO_LOCK_H +#define _BITS_STDIO_LOCK_H 1 -typedef pthread_mutex_t _IO_lock_t; +#include + +__libc_lock_define_recursive (typedef, _IO_lock_t) /* We need recursive (counting) mutexes. */ -#define _IO_lock_initializer PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +#ifdef _LIBC_LOCK_RECURSIVE_INITIALIZER +# define _IO_lock_initializer _LIBC_LOCK_RECURSIVE_INITIALIZER +#elif _IO_MTSAFE_IO + #error libio needs recursive mutexes for _IO_MTSAFE_IO +#endif + +#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) \ - { struct _pthread_cleanup_buffer _buffer; \ - int _avail = (((_fp)->_flags & _IO_USER_LOCK) == 0 \ - && _pthread_cleanup_push_defer != NULL); \ - if (_avail) { \ - _pthread_cleanup_push_defer (&_buffer, (_fct), (_fp)); \ - } + __libc_cleanup_region_start (((_fp)->_flags & _IO_USER_LOCK) == 0, _fct, _fp) +#define _IO_cleanup_region_start_noarg(_fct) \ + __libc_cleanup_region_start (1, _fct, NULL) #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) + __libc_cleanup_region_end (_doit) + + +#endif /* bits/stdio-lock.h */ -- cgit v1.2.3