diff options
| -rw-r--r-- | lib/librthread/rthread.c | 11 | ||||
| -rw-r--r-- | lib/librthread/rthread.h | 3 | ||||
| -rw-r--r-- | lib/librthread/rthread_attr.c | 11 | ||||
| -rw-r--r-- | lib/librthread/rthread_debug.c | 11 | ||||
| -rw-r--r-- | lib/librthread/rthread_file.c | 4 | ||||
| -rw-r--r-- | lib/librthread/rthread_fork.c | 6 | ||||
| -rw-r--r-- | lib/librthread/rthread_libc.c | 4 | ||||
| -rw-r--r-- | lib/librthread/rthread_sched.c | 11 | ||||
| -rw-r--r-- | lib/librthread/rthread_sig.c | 12 | ||||
| -rw-r--r-- | lib/librthread/rthread_stack.c | 3 | ||||
| -rw-r--r-- | lib/librthread/rthread_sync.c | 11 | ||||
| -rw-r--r-- | lib/librthread/rthread_tls.c | 12 |
12 files changed, 14 insertions, 85 deletions
diff --git a/lib/librthread/rthread.c b/lib/librthread/rthread.c index eb5cbadc89c..60c6eea6333 100644 --- a/lib/librthread/rthread.c +++ b/lib/librthread/rthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.c,v 1.43 2011/10/17 06:39:20 guenther Exp $ */ +/* $OpenBSD: rthread.c,v 1.44 2011/11/06 11:48:58 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -20,20 +20,13 @@ * threads. */ -#include <sys/param.h> -#include <sys/event.h> -#include <sys/mman.h> -#include <sys/wait.h> +#include <sys/types.h> -#include <machine/spinlock.h> - -#include <fcntl.h> #include <stdlib.h> #include <unistd.h> #include <signal.h> #include <stdio.h> #include <string.h> -#include <err.h> #include <errno.h> #include <dlfcn.h> diff --git a/lib/librthread/rthread.h b/lib/librthread/rthread.h index c0dc626ca9f..739ec7fa31d 100644 --- a/lib/librthread/rthread.h +++ b/lib/librthread/rthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.h,v 1.26 2011/10/17 06:39:20 guenther Exp $ */ +/* $OpenBSD: rthread.h,v 1.27 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -27,6 +27,7 @@ #include <sys/queue.h> #include <semaphore.h> +#include <machine/spinlock.h> #include <machine/tcb.h> /* for TLS_VARIANT */ #ifdef __LP64__ diff --git a/lib/librthread/rthread_attr.c b/lib/librthread/rthread_attr.c index 3d31ada7ab5..83f0ba5da28 100644 --- a/lib/librthread/rthread_attr.c +++ b/lib/librthread/rthread_attr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_attr.c,v 1.9 2008/10/13 05:42:46 kevlo Exp $ */ +/* $OpenBSD: rthread_attr.c,v 1.10 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -19,18 +19,9 @@ * generic attribute support */ -#include <sys/param.h> -#include <sys/mman.h> -#include <sys/wait.h> - -#include <machine/spinlock.h> - #include <inttypes.h> #include <stdlib.h> #include <unistd.h> -#include <signal.h> -#include <stdio.h> -#include <string.h> #include <errno.h> #include <pthread.h> diff --git a/lib/librthread/rthread_debug.c b/lib/librthread/rthread_debug.c index 1111a615707..aefc34da834 100644 --- a/lib/librthread/rthread_debug.c +++ b/lib/librthread/rthread_debug.c @@ -1,21 +1,12 @@ -/* $OpenBSD: rthread_debug.c,v 1.1 2005/12/31 21:40:43 marc Exp $ */ +/* $OpenBSD: rthread_debug.c,v 1.2 2011/11/06 11:48:59 guenther Exp $ */ /* $snafu: rthread_debug.c,v 1.2 2004/12/09 18:41:44 marc Exp $ */ /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */ -#define _POSIX_THREADS - -#include <sys/param.h> -#include <sys/mman.h> -#include <sys/wait.h> - -#include <machine/spinlock.h> - #include <pthread.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#include <time.h> #include <unistd.h> #include "rthread.h" diff --git a/lib/librthread/rthread_file.c b/lib/librthread/rthread_file.c index 95358514d0f..14190662885 100644 --- a/lib/librthread/rthread_file.c +++ b/lib/librthread/rthread_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_file.c,v 1.2 2009/11/27 19:45:54 guenther Exp $ */ +/* $OpenBSD: rthread_file.c,v 1.3 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -40,10 +40,8 @@ #include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> #include <sys/queue.h> #include <pthread.h> -#include <machine/spinlock.h> #include "rthread.h" /* diff --git a/lib/librthread/rthread_fork.c b/lib/librthread/rthread_fork.c index b5a8afc2dde..9ca144821c4 100644 --- a/lib/librthread/rthread_fork.c +++ b/lib/librthread/rthread_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_fork.c,v 1.3 2009/11/27 19:42:24 guenther Exp $ */ +/* $OpenBSD: rthread_fork.c,v 1.4 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 2008 Kurt Miller <kurt@openbsd.org> @@ -30,10 +30,6 @@ * $FreeBSD: /repoman/r/ncvs/src/lib/libc_r/uthread/uthread_atfork.c,v 1.1 2004/12/10 03:36:45 grog Exp $ */ -#include <sys/param.h> - -#include <machine/spinlock.h> - #include <errno.h> #include <pthread.h> #include <stdlib.h> diff --git a/lib/librthread/rthread_libc.c b/lib/librthread/rthread_libc.c index fc943c45571..3c263ba6e38 100644 --- a/lib/librthread/rthread_libc.c +++ b/lib/librthread/rthread_libc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_libc.c,v 1.7 2008/06/13 21:18:43 otto Exp $ */ +/* $OpenBSD: rthread_libc.c,v 1.8 2011/11/06 11:48:59 guenther Exp $ */ /* $snafu: libc_tag.c,v 1.4 2004/11/30 07:00:06 marc Exp $ */ /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */ @@ -7,8 +7,6 @@ #include <sys/time.h> -#include <machine/spinlock.h> - #include <pthread.h> #include <stdlib.h> #include <string.h> diff --git a/lib/librthread/rthread_sched.c b/lib/librthread/rthread_sched.c index c7a2268437e..c11c369ae2a 100644 --- a/lib/librthread/rthread_sched.c +++ b/lib/librthread/rthread_sched.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sched.c,v 1.7 2006/01/06 09:49:16 otto Exp $ */ +/* $OpenBSD: rthread_sched.c,v 1.8 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -19,17 +19,8 @@ * scheduling routines */ -#include <sys/param.h> -#include <sys/mman.h> -#include <sys/wait.h> - -#include <machine/spinlock.h> - -#include <stdlib.h> #include <unistd.h> #include <signal.h> -#include <stdio.h> -#include <string.h> #include <errno.h> #include <pthread.h> diff --git a/lib/librthread/rthread_sig.c b/lib/librthread/rthread_sig.c index 392e20c43e9..cfb7b2e87c6 100644 --- a/lib/librthread/rthread_sig.c +++ b/lib/librthread/rthread_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sig.c,v 1.8 2009/11/27 19:43:55 guenther Exp $ */ +/* $OpenBSD: rthread_sig.c,v 1.9 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -19,17 +19,7 @@ * signals */ -#include <sys/param.h> -#include <sys/mman.h> -#include <sys/wait.h> - -#include <machine/spinlock.h> - -#include <stdlib.h> -#include <unistd.h> #include <signal.h> -#include <stdio.h> -#include <string.h> #include <errno.h> #include <pthread.h> diff --git a/lib/librthread/rthread_stack.c b/lib/librthread/rthread_stack.c index cb85d8f8210..3ffae44c21d 100644 --- a/lib/librthread/rthread_stack.c +++ b/lib/librthread/rthread_stack.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_stack.c,v 1.4 2010/05/26 21:40:05 guenther Exp $ */ +/* $OpenBSD: rthread_stack.c,v 1.5 2011/11/06 11:48:59 guenther Exp $ */ /* $snafu: rthread_stack.c,v 1.12 2005/01/11 02:45:28 marc Exp $ */ /* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */ @@ -7,7 +7,6 @@ #include <sys/mman.h> #include <machine/param.h> -#include <machine/spinlock.h> #include <errno.h> #include <pthread.h> diff --git a/lib/librthread/rthread_sync.c b/lib/librthread/rthread_sync.c index a602025e818..b619843504e 100644 --- a/lib/librthread/rthread_sync.c +++ b/lib/librthread/rthread_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sync.c,v 1.24 2011/09/22 04:54:38 guenther Exp $ */ +/* $OpenBSD: rthread_sync.c,v 1.25 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -20,17 +20,8 @@ */ -#include <sys/param.h> -#include <sys/mman.h> -#include <sys/wait.h> - -#include <machine/spinlock.h> - #include <stdlib.h> #include <unistd.h> -#include <signal.h> -#include <stdio.h> -#include <string.h> #include <errno.h> #include <pthread.h> diff --git a/lib/librthread/rthread_tls.c b/lib/librthread/rthread_tls.c index 572c3ba83c7..dfa14b0aa34 100644 --- a/lib/librthread/rthread_tls.c +++ b/lib/librthread/rthread_tls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_tls.c,v 1.12 2011/07/05 00:23:40 tedu Exp $ */ +/* $OpenBSD: rthread_tls.c,v 1.13 2011/11/06 11:48:59 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -19,17 +19,7 @@ * thread specific storage */ -#include <sys/param.h> -#include <sys/mman.h> -#include <sys/wait.h> - -#include <machine/spinlock.h> - #include <stdlib.h> -#include <unistd.h> -#include <signal.h> -#include <stdio.h> -#include <string.h> #include <errno.h> #include <pthread.h> |