From 9f17b787d5c453a17ea8711aa47fc4f191810c40 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sun, 29 Apr 2007 01:36:04 +0000
Subject: [PATCH] When <sys/user.h> is included, it MUST be included first
 because it sets a preprocessor variable that effects other header files.

---
 lib/libkcore/kcore_file.c | 4 ++--
 lib/libkcore/kcore_proc.c | 4 ++--
 lib/libkvm/kvm.c          | 4 ++--
 lib/libkvm/kvm_amd64.c    | 4 ++--
 lib/libkvm/kvm_file.c     | 4 ++--
 lib/libkvm/kvm_i386.c     | 4 ++--
 lib/libkvm/kvm_proc.c     | 4 ++--
 lib/libkvm/kvm_sparc.c    | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/libkcore/kcore_file.c b/lib/libkcore/kcore_file.c
index 6d5f67eac9..95eb9ca083 100644
--- a/lib/libkcore/kcore_file.c
+++ b/lib/libkcore/kcore_file.c
@@ -31,15 +31,15 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/lib/libkcore/kcore_file.c,v 1.4 2007/02/01 10:33:25 corecode Exp $
+ * $DragonFly: src/lib/libkcore/kcore_file.c,v 1.5 2007/04/29 01:36:03 dillon Exp $
  */
 
 #define _KERNEL_STRUCTURES
 
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/kcore.h>
-#include <sys/user.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/lib/libkcore/kcore_proc.c b/lib/libkcore/kcore_proc.c
index 2b5ceec512..9a1539765f 100644
--- a/lib/libkcore/kcore_proc.c
+++ b/lib/libkcore/kcore_proc.c
@@ -31,12 +31,12 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/lib/libkcore/kcore_proc.c,v 1.1 2004/11/24 22:51:01 joerg Exp $
+ * $DragonFly: src/lib/libkcore/kcore_proc.c,v 1.2 2007/04/29 01:36:03 dillon Exp $
  */
 
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/param.h>
 #include <sys/sysctl.h>
-#include <sys/user.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 935d84b4d7..3660c99c79 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -36,11 +36,11 @@
  *
  * @(#)kvm.c	8.2 (Berkeley) 2/13/94
  * $FreeBSD: src/lib/libkvm/kvm.c,v 1.12.2.3 2002/09/13 14:53:43 nectar Exp $
- * $DragonFly: src/lib/libkvm/kvm.c,v 1.9 2007/02/01 10:33:25 corecode Exp $
+ * $DragonFly: src/lib/libkvm/kvm.c,v 1.10 2007/04/29 01:36:04 dillon Exp $
  */
 
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index 4f708a549e..f6e211d52d 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -36,7 +36,7 @@
  *
  * @(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.16 2003/04/30 21:05:33 peter Exp $
- * $DragonFly: src/lib/libkvm/kvm_amd64.c,v 1.1 2004/02/02 05:43:15 dillon Exp $
+ * $DragonFly: src/lib/libkvm/kvm_amd64.c,v 1.2 2007/04/29 01:36:04 dillon Exp $
  */
 
 /*
@@ -44,8 +44,8 @@
  * vm code will one day obsolete this module.
  */
 
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <stdlib.h>
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index 2f5352170e..eea6822cf1 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -32,7 +32,7 @@
  *
  * @(#)kvm_file.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libkvm/kvm_file.c,v 1.11 2000/02/18 16:39:00 peter Exp $
- * $DragonFly: src/lib/libkvm/kvm_file.c,v 1.3 2004/04/11 21:28:03 cpressey Exp $
+ * $DragonFly: src/lib/libkvm/kvm_file.c,v 1.4 2007/04/29 01:36:04 dillon Exp $
  */
 
 /*
@@ -42,8 +42,8 @@
  * most other applications are interested only in open/close/read/nlist).
  */
 
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #define _KERNEL
 #include <sys/file.h>
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 52d7ccd57c..2961e1866b 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -36,7 +36,7 @@
  *
  * @(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.11.2.1 2001/09/21 04:01:51 peter Exp $
- * $DragonFly: src/lib/libkvm/kvm_i386.c,v 1.2 2003/06/17 04:26:49 dillon Exp $
+ * $DragonFly: src/lib/libkvm/kvm_i386.c,v 1.3 2007/04/29 01:36:04 dillon Exp $
  */
 
 /*
@@ -44,8 +44,8 @@
  * vm code will one day obsolete this module.
  */
 
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <stdlib.h>
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index f4d353ae89..9bc2df4373 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.25.2.3 2002/08/24 07:27:46 kris Exp $
- * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.12 2007/02/18 16:15:23 corecode Exp $
+ * $DragonFly: src/lib/libkvm/kvm_proc.c,v 1.13 2007/04/29 01:36:04 dillon Exp $
  *
  * @(#)kvm_proc.c	8.3 (Berkeley) 9/23/93
  */
@@ -47,7 +47,7 @@
  * most other applications are interested only in open/close/read/nlist).
  */
 
-#include <sys/user.h>
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/conf.h>
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c
index 99226d382b..344cab864d 100644
--- a/lib/libkvm/kvm_sparc.c
+++ b/lib/libkvm/kvm_sparc.c
@@ -36,7 +36,7 @@
  *
  * @(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libkvm/kvm_sparc.c,v 1.3 1999/12/27 07:14:58 peter Exp $
- * $DragonFly: src/lib/libkvm/kvm_sparc.c,v 1.3 2004/04/11 21:28:03 cpressey Exp $
+ * $DragonFly: src/lib/libkvm/kvm_sparc.c,v 1.4 2007/04/29 01:36:04 dillon Exp $
  */
 
 /*
@@ -44,8 +44,8 @@
  * vm code will one day obsolete this module.
  */
 
+#include <sys/user.h>	/* MUST BE FIRST */
 #include <sys/param.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <unistd.h>
-- 
2.41.0