diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 2002-11-03 23:58:40 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 2002-11-03 23:58:40 +0000 |
| commit | cdbe8f98f1aaa4cc2ae34992b7621c49424b54df (patch) | |
| tree | 759f651ba7c936d05138249d22d57ce2fcaeaca0 /lib/libc/thread | |
| parent | 664e44eac173bd00d9757c4d15084393436fcbdc (diff) | |
back out previous patch.. there are still some vax/m68k issues
Diffstat (limited to 'lib/libc/thread')
| -rw-r--r-- | lib/libc/thread/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libc/thread/thread_fd.c | 37 | ||||
| -rw-r--r-- | lib/libc/thread/unithread_malloc_lock.c | 16 |
3 files changed, 37 insertions, 20 deletions
diff --git a/lib/libc/thread/Makefile.inc b/lib/libc/thread/Makefile.inc index 4d35600ff1c..b28dfd676ae 100644 --- a/lib/libc/thread/Makefile.inc +++ b/lib/libc/thread/Makefile.inc @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile.inc,v 1.3 2002/11/03 20:36:43 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/11/03 23:58:39 marc Exp $ .PATH: ${LIBCSRCDIR}/thread -SRCS+= thread_fd.c unithread_storage.c unithread_malloc_lock.c +SRCS+= thread_fd.c unithread_storage.c diff --git a/lib/libc/thread/thread_fd.c b/lib/libc/thread/thread_fd.c index ffea643f58f..c93d15825eb 100644 --- a/lib/libc/thread/thread_fd.c +++ b/lib/libc/thread/thread_fd.c @@ -1,25 +1,52 @@ -/* $OpenBSD: thread_fd.c,v 1.5 2002/11/03 20:36:43 marc Exp $ */ +/* $OpenBSD: thread_fd.c,v 1.6 2002/11/03 23:58:39 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)(int fd, int lock_type, struct timespec *timeout, - const char *fname, int lineno) +WEAK_NAME(_thread_fd_lock)(fd, lock_type, timeout) + int fd; + int lock_type; + struct timespec *timeout; { 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)(int fd, int lock_type, const char *fname, - int lineno) +WEAK_NAME(_thread_fd_unlock_debug)(fd, lock_type, fname, lineno) + int fd; + int lock_type; + char *fname; + int lineno; { } diff --git a/lib/libc/thread/unithread_malloc_lock.c b/lib/libc/thread/unithread_malloc_lock.c index abe1a172b65..1b33b29a495 100644 --- a/lib/libc/thread/unithread_malloc_lock.c +++ b/lib/libc/thread/unithread_malloc_lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unithread_malloc_lock.c,v 1.2 2002/11/03 20:36:43 marc Exp $ */ +/* $OpenBSD: unithread_malloc_lock.c,v 1.3 2002/11/03 23:58:39 marc Exp $ */ #include <sys/cdefs.h> #include <pthread.h> @@ -6,26 +6,16 @@ WEAK_PROTOTYPE(_thread_malloc_lock); WEAK_PROTOTYPE(_thread_malloc_unlock); -WEAK_PROTOTYPE(_thread_malloc_init); WEAK_ALIAS(_thread_malloc_lock); WEAK_ALIAS(_thread_malloc_unlock); -WEAK_ALIAS(_thread_malloc_init); void -WEAK_NAME(_thread_malloc_lock)(void) +WEAK_NAME(_thread_malloc_lock)() { - return; } void -WEAK_NAME(_thread_malloc_unlock)(void) +WEAK_NAME(_thread_malloc_unlock)() { - return; -} - -void -WEAK_NAME(_thread_malloc_init)(void) -{ - return; } |