Moved the declaration of boolean_t from <vm/vm_param.h> to

<sys/types.h> (if KERNEL is defined).  This allows removing bogus
dependencies on vm stuff in several places (e.g., ddb) and stops
<vm_param.h> from depending on <vm_param.h>

Added declaration of boolean_t to <vm/vm.h> (if KERNEL is not
defined).  It never belonged in <vm/vm_param.h>.  Unfortunately,
it is required for some vm headers that are included by applications.

Deleted declarations of TRUE and FALSE from <vm/vm_param.h>.  They
are defined in <sys/param.h> if KERNEL is defined and we'll soon
find out if any applications depend on them being defined in a vm
header.

3 files changed, 13 insertions, 11 deletions

diff --git a/sys/sys/types.h b/sys/sys/types.h
index 27e8c97..11176eb 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.4 (Berkeley) 1/21/94
- * $Id: types.h,v 1.5 1995/06/28 01:39:50 bde Exp $
+ * $Id: types.h,v 1.6 1995/12/05 20:54:35 bde Exp $
  */
 
 #ifndef _SYS_TYPES_H_
@@ -76,6 +76,7 @@ typedef	long		swblk_t;	/* swap offset */
 typedef	unsigned long	uid_t;		/* user id */
 
 #ifdef KERNEL
+typedef int		boolean_t;
 struct vm_page;
 typedef struct vm_page	*vm_page_t;
 #endif
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index f56dd1b..eba8b3e 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id: vm.h,v 1.7 1995/12/05 20:54:42 bde Exp $
+ * $Id: vm.h,v 1.8 1995/12/07 12:48:07 davidg Exp $
  */
 
 #ifndef VM_H
@@ -54,6 +54,15 @@ typedef struct vm_object *vm_object_t;
 
 #ifndef KERNEL
 /*
+ * This is defined in <sys/types.h> for the kernel so that non-vm kernel
+ * sources (mainly Mach-derived ones such as ddb) don't have to include
+ * vm stuff.  Defining it there for applications might break things.
+ * Define it here for "applications" that include vm headers (e.g.,
+ * genassym).
+ */
+typedef int boolean_t;
+
+/*
  * This is defined in <sys/types.h> for the kernel so that vnode_if.h
  * doesn't have to include <vm/vm.h>.
  */
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index 4b047f9..7f05ebf 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_param.h,v 1.3 1994/08/02 07:55:37 davidg Exp $
+ * $Id: vm_param.h,v 1.4 1995/01/09 16:05:57 davidg Exp $
  */
 
 /*
@@ -74,14 +74,6 @@
 #include <machine/vmparam.h>
 
 /*
- * This belongs in types.h, but breaks too many existing programs.
- */
-typedef int boolean_t;
-
-#define	TRUE	1
-#define	FALSE	0
-
-/*
  *	The machine independent pages are refered to as PAGES.  A page
  *	is some number of hardware pages, depending on the target machine.
  */