From c359575443c39f004128bb9c5eefe2c1d52d1eee Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Tue, 18 Dec 2012 21:28:46 +0000
Subject: 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@

---
 usr.bin/tmux/procname.c  |  3 ++-
 usr.bin/top/machine.c    | 12 +++++++-----
 usr.bin/w/proc_compare.c |  5 +++--
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'usr.bin')

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"
 
-- 
cgit v1.2.3