diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2012-12-18 21:28:46 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2012-12-18 21:28:46 +0000 |
| commit | c359575443c39f004128bb9c5eefe2c1d52d1eee (patch) | |
| tree | 092ed87be3434dfa9c7a7542b6e6c940ed262cbc | |
| parent | 1e6aff40c0fef090da9461e3b90e56811e221295 (diff) | |
We no longer use struct eproc for kinfo_proc in sysctl.h so there
is no direct need for sys/proc.h or sys/resource.h. Some consumers
of kinfo_proc need these for the proc flags and rlimit defines like
RLIM_INF so add the appropriate includes to them.
OK deraadt@ sthen@
| -rw-r--r-- | sys/sys/sysctl.h | 7 | ||||
| -rw-r--r-- | usr.bin/tmux/procname.c | 3 | ||||
| -rw-r--r-- | usr.bin/top/machine.c | 12 | ||||
| -rw-r--r-- | usr.bin/w/proc_compare.c | 5 | ||||
| -rw-r--r-- | usr.sbin/pstat/pstat.c | 3 | ||||
| -rw-r--r-- | usr.sbin/snmpd/mib.c | 3 | ||||
| -rw-r--r-- | usr.sbin/tcpdrop/tcpdrop.c | 3 | ||||
| -rw-r--r-- | usr.sbin/watchdogd/watchdogd.c | 3 |
8 files changed, 21 insertions, 18 deletions
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 4843bb85237..5be3124385d 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.126 2012/12/05 23:20:24 deraadt Exp $ */ +/* $OpenBSD: sysctl.h,v 1.127 2012/12/18 21:28:45 millert Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -38,11 +38,6 @@ #ifndef _SYS_SYSCTL_H_ #define _SYS_SYSCTL_H_ -#ifndef _KERNEL -#include <sys/proc.h> /* for SRUN, SIDL, etc */ -#include <sys/resource.h> /* for struct loadavg */ -#endif - #include <uvm/uvm_extern.h> /* diff --git a/usr.bin/tmux/procname.c b/usr.bin/tmux/procname.c index 5900200ffba..38029789658 100644 --- a/usr.bin/tmux/procname.c +++ b/usr.bin/tmux/procname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procname.c,v 1.9 2012/09/24 13:05:10 nicm Exp $ */ +/* $OpenBSD: procname.c,v 1.10 2012/12/18 21:28:45 millert Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -17,6 +17,7 @@ */ #include <sys/param.h> +#include <sys/proc.h> #include <sys/sysctl.h> #include <sys/stat.h> diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index c3ff731872c..8d022e7e709 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machine.c,v 1.74 2012/07/09 22:41:45 deraadt Exp $ */ +/* $OpenBSD: machine.c,v 1.75 2012/12/18 21:28:45 millert Exp $ */ /*- * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com> @@ -35,14 +35,16 @@ #include <sys/types.h> #include <sys/param.h> +#include <sys/dkstat.h> +#include <sys/mount.h> +#include <sys/proc.h> +#include <sys/swap.h> +#include <sys/sysctl.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <sys/sysctl.h> -#include <sys/dkstat.h> -#include <sys/mount.h> -#include <sys/swap.h> #include <err.h> #include <errno.h> diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c index a03ef9e84bb..4952157fad9 100644 --- a/usr.bin/w/proc_compare.c +++ b/usr.bin/w/proc_compare.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc_compare.c,v 1.12 2011/04/10 03:20:59 guenther Exp $ */ +/* $OpenBSD: proc_compare.c,v 1.13 2012/12/18 21:28:45 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -30,8 +30,9 @@ */ #include <sys/param.h> -#include <sys/time.h> +#include <sys/proc.h> #include <sys/sysctl.h> +#include <sys/time.h> #include "extern.h" diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index fadaa6f0156..a55c32670d0 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.81 2012/07/11 07:50:39 guenther Exp $ */ +/* $OpenBSD: pstat.c,v 1.82 2012/12/18 21:28:45 millert Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -31,6 +31,7 @@ */ #include <sys/param.h> +#include <sys/proc.h> #include <sys/time.h> #include <sys/buf.h> #include <sys/vnode.h> diff --git a/usr.sbin/snmpd/mib.c b/usr.sbin/snmpd/mib.c index b790fe4d8ae..bdb3f4ab667 100644 --- a/usr.sbin/snmpd/mib.c +++ b/usr.sbin/snmpd/mib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mib.c,v 1.62 2012/11/29 13:16:30 mikeb Exp $ */ +/* $OpenBSD: mib.c,v 1.63 2012/12/18 21:28:45 millert Exp $ */ /* * Copyright (c) 2012 Joel Knight <joel@openbsd.org> @@ -19,6 +19,7 @@ #include <sys/queue.h> #include <sys/param.h> +#include <sys/proc.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c index bda48bf7471..577d8f9c3b3 100644 --- a/usr.sbin/tcpdrop/tcpdrop.c +++ b/usr.sbin/tcpdrop/tcpdrop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpdrop.c,v 1.8 2009/06/13 19:06:16 andreas Exp $ */ +/* $OpenBSD: tcpdrop.c,v 1.9 2012/12/18 21:28:45 millert Exp $ */ /* * Copyright (c) 2004 Markus Friedl <markus@openbsd.org> @@ -19,6 +19,7 @@ #include <sys/param.h> #include <sys/socket.h> #include <sys/sysctl.h> +#include <sys/timeout.h> #include <netinet/in.h> #include <netinet/tcp.h> diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c index d7905679163..2f7850d35d5 100644 --- a/usr.sbin/watchdogd/watchdogd.c +++ b/usr.sbin/watchdogd/watchdogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: watchdogd.c,v 1.13 2009/06/24 14:28:19 sthen Exp $ */ +/* $OpenBSD: watchdogd.c,v 1.14 2012/12/18 21:28:45 millert Exp $ */ /* * Copyright (c) 2005 Marc Balmer <mbalmer@openbsd.org> @@ -17,6 +17,7 @@ */ #include <sys/param.h> +#include <sys/resource.h> #include <sys/sysctl.h> #include <sys/mman.h> |