thread safe libc -- 2nd try. OK miod@, millert@

Thanks to miod@ for m68k and vax fixes

1 files changed, 5 insertions, 32 deletions

diff --git a/lib/libc/thread/thread_fd.c b/lib/libc/thread/thread_fd.c
index c93d15825eb..f2a9ae2290b 100644
--- a/lib/libc/thread/thread_fd.c
+++ b/lib/libc/thread/thread_fd.c
@@ -1,52 +1,25 @@
-/*	$OpenBSD: thread_fd.c,v 1.6 2002/11/03 23:58:39 marc Exp $	*/
+/*	$OpenBSD: thread_fd.c,v 1.7 2002/11/05 22:19:55 marc Exp $	*/
 
 #include <sys/time.h>
 #include <pthread.h>
 #include "thread_private.h"
 
 WEAK_PROTOTYPE(_thread_fd_lock);
-WEAK_PROTOTYPE(_thread_fd_lock_debug);
 WEAK_PROTOTYPE(_thread_fd_unlock);
-WEAK_PROTOTYPE(_thread_fd_unlock_debug);
 
 WEAK_ALIAS(_thread_fd_lock);
-WEAK_ALIAS(_thread_fd_lock_debug);
 WEAK_ALIAS(_thread_fd_unlock);
-WEAK_ALIAS(_thread_fd_unlock_debug);
 
 int     
-WEAK_NAME(_thread_fd_lock)(fd, lock_type, timeout)
-	int	fd;
-	int	lock_type;
-	struct timespec *timeout;
+WEAK_NAME(_thread_fd_lock)(int fd, int lock_type, struct timespec *timeout,
+			   const char *fname, int lineno)
 {
 	return 0;
 }
 
-int     
-WEAK_NAME(_thread_fd_lock_debug)(fd, lock_type, timeout, fname, lineno)
-	int	fd;
-	int	lock_type;
-	struct timespec *timeout;
-	char	*fname;
-	int	lineno;
-{
-	return 0;
-}
-
-void
-WEAK_NAME(_thread_fd_unlock)(fd, lock_type)
-	int	fd;
-	int	lock_type;
-{
-}
-
 void
-WEAK_NAME(_thread_fd_unlock_debug)(fd, lock_type, fname, lineno)
-	int	fd;
-	int	lock_type;
-	char	*fname;
-	int	lineno;
+WEAK_NAME(_thread_fd_unlock)(int fd, int lock_type, const char *fname,
+			     int lineno)
 {
 }