From a8e58aa9ab2667045c1b21e5c1c5e21b075a782f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 1 Sep 2000 09:09:56 +0000 Subject: Update. [_IO_MTSAFE_IO] (_IO_flockfile, _IO_funlockfile): Add macros which test _IO_USER_LOCK flag first. --- linuxthreads/sysdeps/pthread/bits/stdio-lock.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'linuxthreads/sysdeps') diff --git a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h index edc69f6cfc..ba3e781928 100644 --- a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h @@ -1,5 +1,5 @@ /* Thread package specific definitions of stream lock type. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000 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 @@ -26,7 +26,12 @@ typedef pthread_mutex_t _IO_lock_t; #define _IO_cleanup_region_start(_fct, _fp) \ - __libc_cleanup_region_start (_fct, _fp) + { struct _pthread_cleanup_buffer _buffer; \ + int _avail = (((_fp)->_mode & _IO_USER_LOCK) == 0 \ + && _pthread_cleanup_push_defer != NULL); \ + if (_avail) { \ + _pthread_cleanup_push_defer (&_buffer, (_fct), (_fp)); \ + } #define _IO_cleanup_region_end(_doit) \ __libc_cleanup_region_end (_doit) #define _IO_lock_init(_name) \ -- cgit v1.2.3