buildworld - Fix breakage

* Fix some _KERNEL_STRUCTURES breakage.  This isn't a fantastic solution
  but it works.

Reported-by: swildner

diff --git a/lib/libkcore/kcore.c b/lib/libkcore/kcore.c
index 5b857f1..8e9b368 100644 (file)
--- a/lib/libkcore/kcore.c
+++ b/lib/libkcore/kcore.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkcore/kcore.c,v 1.6 2005/02/03 17:28:40 joerg Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/fcntl.h>
 

diff --git a/lib/libkcore/kcore_sched.c b/lib/libkcore/kcore_sched.c
index d6840ce..18f127f 100644 (file)
--- a/lib/libkcore/kcore_sched.c
+++ b/lib/libkcore/kcore_sched.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkcore/kcore_sched.c,v 1.5 2006/08/03 16:40:46 swildner Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 
 #include <assert.h>

diff --git a/lib/libkcore/kcore_tty.c b/lib/libkcore/kcore_tty.c
index cc9fae8..09578c3 100644 (file)
--- a/lib/libkcore/kcore_tty.c
+++ b/lib/libkcore/kcore_tty.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkcore/kcore_tty.c,v 1.1 2004/12/22 11:01:49 joerg Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 
 #include <err.h>

diff --git a/lib/libkcore/kcore_vfs.c b/lib/libkcore/kcore_vfs.c
index b88b1ff..e887fc4 100644 (file)
--- a/lib/libkcore/kcore_vfs.c
+++ b/lib/libkcore/kcore_vfs.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkcore/kcore_vfs.c,v 1.2 2004/12/22 11:01:49 joerg Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 
 #include <err.h>

diff --git a/lib/libkinfo/kinfo_file.c b/lib/libkinfo/kinfo_file.c
index 8168604..42a1b8f 100644 (file)
--- a/lib/libkinfo/kinfo_file.c
+++ b/lib/libkinfo/kinfo_file.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkinfo/kinfo_file.c,v 1.4 2004/12/21 15:07:42 joerg Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 

diff --git a/lib/libkinfo/kinfo_net.c b/lib/libkinfo/kinfo_net.c
index 7abd7ab..5c37330 100644 (file)
--- a/lib/libkinfo/kinfo_net.c
+++ b/lib/libkinfo/kinfo_net.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkinfo/kinfo_net.c,v 1.1 2005/05/01 04:05:35 hmp Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>

diff --git a/lib/libkinfo/kinfo_pcpu.c b/lib/libkinfo/kinfo_pcpu.c
index 8f7eef3..44c9b80 100644 (file)
--- a/lib/libkinfo/kinfo_pcpu.c
+++ b/lib/libkinfo/kinfo_pcpu.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkinfo/kinfo_pcpu.c,v 1.3 2005/05/01 04:05:35 hmp Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 

diff --git a/lib/libkinfo/kinfo_sched.c b/lib/libkinfo/kinfo_sched.c
index a342aec..2242538 100644 (file)
--- a/lib/libkinfo/kinfo_sched.c
+++ b/lib/libkinfo/kinfo_sched.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkinfo/kinfo_sched.c,v 1.3 2005/04/27 16:16:30 hmp Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 

diff --git a/lib/libkinfo/kinfo_tty.c b/lib/libkinfo/kinfo_tty.c
index 3c973cd..f3e5d3d 100644 (file)
--- a/lib/libkinfo/kinfo_tty.c
+++ b/lib/libkinfo/kinfo_tty.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkinfo/kinfo_tty.c,v 1.1 2004/12/22 11:01:49 joerg Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 

diff --git a/lib/libkinfo/kinfo_vfs.c b/lib/libkinfo/kinfo_vfs.c
index b56e21e..df5857c 100644 (file)
--- a/lib/libkinfo/kinfo_vfs.c
+++ b/lib/libkinfo/kinfo_vfs.c
@@ -34,6 +34,7 @@
  * $DragonFly: src/lib/libkinfo/kinfo_vfs.c,v 1.4 2005/01/31 16:51:09 joerg Exp $
  */
 
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 

diff --git a/lib/libkvm/kvm_minidump_x86_64.c b/lib/libkvm/kvm_minidump_x86_64.c
index 6a14849..71d5744 100644 (file)
--- a/lib/libkvm/kvm_minidump_x86_64.c
+++ b/lib/libkvm/kvm_minidump_x86_64.c
@@ -23,14 +23,12 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /*
  * AMD64 machine dependent routines for kvm and minidumps.
  */
 
+#include <sys/user.h>     /* MUST BE FIRST */
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/mman.h>

diff --git a/sys/sys/kinfo.h b/sys/sys/kinfo.h
index dc0242b..e7123fe 100644 (file)
--- a/sys/sys/kinfo.h
+++ b/sys/sys/kinfo.h
@@ -37,6 +37,10 @@
 #ifndef _SYS_KINFO_H_
 #define _SYS_KINFO_H_
 
+#ifndef _KERNEL_STRUCTURES
+#define _KERNEL_STRUCTURES
+#endif
+
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
@@ -45,9 +49,6 @@
 #endif
 #include <sys/resource.h>
 #include <sys/rtprio.h>
-#ifndef _KERNEL_STRUCTURES
-#define _KERNEL_STRUCTURES
-#endif
 #include <sys/proc.h>
 
 struct kinfo_file {

diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 9e7044d..5467fa0 100644 (file)
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -66,6 +66,8 @@ struct uprof {                        /* profile arguments */
        u_long  pr_ticks;       /* temp storage for ticks until AST */
 };
 
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
+
 /*
  * Kernel shareable process resource limits.  Because this structure
  * is moderately large but changes infrequently, it is normally
@@ -105,6 +107,8 @@ struct uidinfo {
        struct varsymset ui_varsymset;  /* variant symlinks */
 };
 
+#endif
+
 #ifdef _KERNEL
 
 struct proc;

diff --git a/sys/sys/time.h b/sys/sys/time.h
index 27f17a2..98cbba1 100644 (file)
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -178,7 +178,7 @@ struct clockinfo {
 #define TIMER_ABSTIME  0x1     /* absolute timer */
 #endif
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
 
 /*
  * For krateprintf()
@@ -192,6 +192,7 @@ struct krate {
 #endif
 
 #ifdef _KERNEL
+
 extern time_t  time_second;
 extern int64_t ntp_tick_permanent;
 extern int64_t ntp_tick_acc;