Move thread prototypes back to <sys/proc.h>

Duplicate boolean_t definition in <sys/types.h>, protected by _KERNEL
Only use boolean_t definition in <vm/vm_param.h> when not _KERNEL
Mark latter two with XXX

diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 2ed7a33..740520b 100644 (file)
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: proc.h,v 1.4 1996/03/24 17:40:44 tholo Exp $  */
+/*     $OpenBSD: proc.h,v 1.5 1996/03/24 18:07:57 tholo Exp $  */
 /*     $NetBSD: proc.h,v 1.42 1996/02/09 18:25:23 christos Exp $       */
 
 /*-
@@ -306,6 +306,12 @@ struct     prochd {
        struct  proc *ph_rlink;
 } qs[NQS];
 
+#define        current_thread()        (curproc->p_thread)
+void   assert_wait __P((event_t, boolean_t));
+void   thread_block __P((void));
+void   thread_sleep __P((event_t, struct slock *, boolean_t));
+void   thread_wakeup __P((event_t));
+
 struct proc *pfind __P((pid_t));       /* Find process by id. */
 struct pgrp *pgfind __P((pid_t));      /* Find process group by id. */
 

diff --git a/sys/sys/types.h b/sys/sys/types.h
index 96842a6..be81e23 100644 (file)
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: types.h,v 1.5 1996/03/23 19:13:11 tholo Exp $ */
+/*     $OpenBSD: types.h,v 1.6 1996/03/24 18:07:58 tholo Exp $ */
 /*     $NetBSD: types.h,v 1.24 1995/12/29 01:15:13 jtc Exp $   */
 
 /*-
@@ -79,6 +79,12 @@ typedef      int32_t         segsz_t;        /* segment size */
 typedef        int32_t         swblk_t;        /* swap offset */
 typedef        u_int32_t       uid_t;          /* user id */
 
+#ifdef _KERNEL /* XXX */
+typedef        int     boolean_t;
+#define        TRUE    1
+#define        FALSE   0
+#endif
+
 /*
  * These belong in unistd.h, but are placed here too to ensure that
  * long arguments will be promoted to off_t if the program fails to 

diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index eb3e4e3..5725fd3 100644 (file)
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vm_param.h,v 1.4 1996/03/24 17:40:46 tholo Exp $      */
+/*     $OpenBSD: vm_param.h,v 1.5 1996/03/24 18:07:59 tholo Exp $      */
 /*     $NetBSD: vm_param.h,v 1.12 1995/03/26 20:39:16 jtc Exp $        */
 
 /* 
@@ -74,18 +74,14 @@
 
 #include <machine/vmparam.h>
 
+#ifndef _KERNEL        /* XXX */
 /*
  * This belongs in types.h, but breaks too many existing programs.
  */
 typedef        int     boolean_t;
 #define        TRUE    1
 #define        FALSE   0
-
-#define        current_thread()        (curproc->p_thread)
-void   assert_wait __P((event_t, boolean_t));
-void   thread_block __P((void));
-void   thread_sleep __P((event_t, struct slock *, boolean_t));
-void   thread_wakeup __P((event_t));
+#endif
 
 /*
  *     The machine independent pages are refered to as PAGES.  A page