aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-01 09:09:56 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-01 09:09:56 +0000
commita8e58aa9ab2667045c1b21e5c1c5e21b075a782f (patch)
treeaea233a6ad4b6e0a075182d868cc3350c19279eb /linuxthreads/sysdeps
parenta91d3cd37bec7699597a45016f4cec985b9f3482 (diff)
downloadglibc-a8e58aa9ab2667045c1b21e5c1c5e21b075a782f.tar
glibc-a8e58aa9ab2667045c1b21e5c1c5e21b075a782f.tar.gz
glibc-a8e58aa9ab2667045c1b21e5c1c5e21b075a782f.tar.bz2
glibc-a8e58aa9ab2667045c1b21e5c1c5e21b075a782f.zip
Update.
[_IO_MTSAFE_IO] (_IO_flockfile, _IO_funlockfile): Add macros which test _IO_USER_LOCK flag first.
Diffstat (limited to 'linuxthreads/sysdeps')
-rw-r--r--linuxthreads/sysdeps/pthread/bits/stdio-lock.h9
1 files changed, 7 insertions, 2 deletions
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) \