about summary refs log tree commit diff
path: root/linuxthreads/lockfile.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-01 08:56:06 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-01 08:56:06 +0000
commita91d3cd37bec7699597a45016f4cec985b9f3482 (patch)
tree74baaf806a322ebc3fa1004155077ee6b8e09b68 /linuxthreads/lockfile.c
parent6f7fa17e402e8cc267651b67669f04f70bc80527 (diff)
downloadglibc-a91d3cd37bec7699597a45016f4cec985b9f3482.tar.gz
glibc-a91d3cd37bec7699597a45016f4cec985b9f3482.tar.xz
glibc-a91d3cd37bec7699597a45016f4cec985b9f3482.zip
Update.
	* libio/Makefile (headers): Add stdio_ext.h.
	(routines): Add __fbufsize, __freading, __fwriting, __freadable,
	__fwritable, __flbf, __fpurge, __fpending, and __fsetlocking.
	* libio/Versions [libc] (GLIBC_2.2): Add __fbufsize, __freading,
	__fwriting, __freadable, __fwritable, __flbf, __fpurge, __fpending,
	__fsetlocking, and _flushlbf.
	* libio/__fbufsize.c: New file.
	* libio/__flbf.c: New file.
	* libio/__fpending.c: New file.
	* libio/__fpurge.c: New file.
	* libio/__freadable.c: New file.
	* libio/__freading.c: New file.
	* libio/__fsetlocking.c: New file.
	* libio/__fwritable.c: New file.
	* libio/__fwriting.c: New file.
	* libio/stdio_ext.h: New file.
	* libio/genops.c (_IO_flush_all_linebuffered): Add alias _flushlbf.
	* libio/libio.h (_IO_USER_LOCK): Define.
Diffstat (limited to 'linuxthreads/lockfile.c')
-rw-r--r--linuxthreads/lockfile.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/linuxthreads/lockfile.c b/linuxthreads/lockfile.c
index a7836b8168..0ef02f8757 100644
--- a/linuxthreads/lockfile.c
+++ b/linuxthreads/lockfile.c
@@ -29,8 +29,7 @@ void
 __flockfile (FILE *stream)
 {
 #ifdef USE_IN_LIBIO
-  if ((stream->_flags & _IO_USER_LOCK) == 0)
-    __pthread_mutex_lock (stream->_lock);
+  __pthread_mutex_lock (stream->_lock);
 #else
 #endif
 }
@@ -45,8 +44,7 @@ void
 __funlockfile (FILE *stream)
 {
 #ifdef USE_IN_LIBIO
-  if ((stream->_flags & _IO_USER_LOCK) == 0)
-    __pthread_mutex_unlock (stream->_lock);
+  __pthread_mutex_unlock (stream->_lock);
 #else
 #endif
 }
@@ -61,10 +59,7 @@ int
 __ftrylockfile (FILE *stream)
 {
 #ifdef USE_IN_LIBIO
-  if ((stream->_flags & _IO_USER_LOCK) == 0)
-    return __pthread_mutex_trylock (stream->_lock);
-  else
-    return 0;
+  return __pthread_mutex_trylock (stream->_lock);
 #else
 #endif
 }