* libio/Makefile (headers): Add bits/stdio-lock.h here.

	* sysdeps/mach/hurd/bits/stdio-lock.h: New file.

4 files changed, 68 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index f147de72ba..522ad5726b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-03-26  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* libio/Makefile (headers): Add bits/stdio-lock.h here.
+
+	* sysdeps/mach/hurd/bits/stdio-lock.h: New file.
+
 	* include/shlib-compat.h: Include <abi-versions.h> unconditionally.
 
 	* posix/unistd.h (intptr_t): Conditionalize on [__USE_MISC ||
diff --git a/libio/Makefile b/libio/Makefile
index 54f32d9fa1..a37445213e 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1995,96,97,98,99,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
@@ -21,7 +21,7 @@
 #
 subdir	:= libio
 
-headers	:= stdio.h libio.h _G_config.h bits/stdio.h
+headers	:= stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h
 
 routines	:=							      \
 	filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen      \
diff --git a/linuxthreads/sysdeps/pthread/Makefile b/linuxthreads/sysdeps/pthread/Makefile
deleted file mode 100644
index 419650c6a6..0000000000
--- a/linuxthreads/sysdeps/pthread/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(subdir),libio)
-sysdep_headers += bits/stdio-lock.h
-endif
diff --git a/sysdeps/mach/hurd/bits/stdio-lock.h b/sysdeps/mach/hurd/bits/stdio-lock.h
new file mode 100644
index 0000000000..1f67542c42
--- /dev/null
+++ b/sysdeps/mach/hurd/bits/stdio-lock.h
@@ -0,0 +1,62 @@
+/* Thread package specific definitions of stream lock type.  Hurd version.
+   Copyright (C) 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
+   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.
+
+   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.
+
+   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.  */
+
+#ifndef _BITS_STDIO_LOCK_H
+#define _BITS_STDIO_LOCK_H 1
+
+/* We need recursive (counting) mutexes.  Since cthreads doesn't really
+   have them, we implement them just for libio.  The implementation is
+   partially here and partially in Hurd's version of cthreads (i.e. the
+   libthreads library, libthreads/lockfile.c).  */
+
+#if (_LIBC - 0) || (_CTHREADS_ - 0)
+#include <cthreads.h>
+
+struct _IO_cthreads_lock
+{
+  struct mutex mutex;
+  cthread_t owner;
+  unsigned int count;
+};
+#else
+struct _IO_cthreads_lock;
+#endif
+typedef struct _IO_cthreads_lock _IO_lock_t;
+
+#define _IO_lock_initializer	{ MUTEX_INITIALIZER, 0, 0 }
+
+#define _IO_lock_init(_name) ({ (_name) = (_IO_lock_t) _IO_lock_initializer; })
+#define _IO_lock_fini(_name) ((void) 0)	/* nothing to do */
+
+/* These are in fact only used for `list_all_lock' (libio/genops.c),
+   which does not need a recursive lock.  The per-FILE locks are only
+   accessed through _IO_flockfile et al, which Hurd's libthreads overrides.  */
+#define _IO_lock_lock(_name) __libc_lock_lock ((_name).mutex)
+#define _IO_lock_unlock(_name) __libc_lock_unlock ((_name).mutex)
+
+
+#include <bits/libc-lock.h>
+
+#define _IO_cleanup_region_start(_fct, _fp) \
+     __libc_cleanup_region_start (_fct, _fp)
+#define _IO_cleanup_region_end(_doit) \
+     __libc_cleanup_region_end (_doit)
+
+
+#endif /* bits/stdio-lock.h */