kinfo_proc.h gone, stuff moved to <sys/sysctl.h>

SCCS-vsn: bin/ps/keyword.c 5.15
SCCS-vsn: usr.bin/fstat/fstat.c 5.44

diff --git a/usr/src/bin/ps/keyword.c b/usr/src/bin/ps/keyword.c
index 8c6fd3e..5445d40 100644 (file)
--- a/usr/src/bin/ps/keyword.c
+++ b/usr/src/bin/ps/keyword.c
@@ -6,18 +6,20 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)keyword.c  5.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)keyword.c  5.15 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>

+

 #include <errno.h>
 #include <errno.h>

+#include <stddef.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <stddef.h>

 #include <string.h>
 #include <string.h>

+

 #include "ps.h"
 
 #ifdef SPPWAIT
 #include "ps.h"
 
 #ifdef SPPWAIT


@@ -26,7 +28,7 @@ static char sccsid[] = "@(#)keyword.c 5.14 (Berkeley) %G%";
 
 #ifdef NEWVM
 #include <sys/ucred.h>
 
 #ifdef NEWVM
 #include <sys/ucred.h>

-#include <sys/kinfo_proc.h>
+#include <sys/sysctl.h>

 #endif
 
 static VAR *findvar __P((char *));
 #endif
 
 static VAR *findvar __P((char *));

diff --git a/usr/src/usr.bin/fstat/fstat.c b/usr/src/usr.bin/fstat/fstat.c
index ec0c715..6b4678a 100644 (file)
--- a/usr/src/usr.bin/fstat/fstat.c
+++ b/usr/src/usr.bin/fstat/fstat.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)fstat.c    5.43 (Berkeley) %G%";
+static char sccsid[] = "@(#)fstat.c    5.44 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -27,7 +27,6 @@ static char sccsid[] = "@(#)fstat.c   5.43 (Berkeley) %G%";
 #include <sys/protosw.h>
 #include <sys/unpcb.h>
 #include <sys/sysctl.h>
 #include <sys/protosw.h>
 #include <sys/unpcb.h>
 #include <sys/sysctl.h>

-#include <sys/kinfo_proc.h>

 #include <sys/filedesc.h>
 #define        KERNEL
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #define        KERNEL
 #include <sys/file.h>


@@ -48,13 +47,13 @@ static char sccsid[] = "@(#)fstat.c 5.43 (Berkeley) %G%";
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 

+#include <ctype.h>

 #include <errno.h>
 #include <errno.h>

-#include <nlist.h>

 #include <kvm.h>
 #include <kvm.h>

+#include <nlist.h>
+#include <paths.h>

 #include <pwd.h>
 #include <stdio.h>
 #include <pwd.h>
 #include <stdio.h>

-#include <paths.h>
-#include <ctype.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>