--- Gnu-Mach/ddb/db_task_thread.c	2020/09/02 04:43:19	1.1.1.2
+++ Gnu-Mach/ddb/db_task_thread.c	2020/09/02 04:45:51	1.1.1.3
@@ -24,10 +24,13 @@
  * the rights to redistribute these changes.
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 #include <machine/db_machdep.h>
+#include <ddb/db_command.h>
+#include <ddb/db_expr.h>
+#include <ddb/db_lex.h>
+#include <ddb/db_output.h>
 #include <ddb/db_task_thread.h>
 #include <ddb/db_variables.h>
 
@@ -52,9 +55,9 @@ db_lookup_task(target_task)
 	task_t target_task;
 {
 	register task_t task;
-	register task_id;
+	register int task_id;
 	register processor_set_t pset;
-	register npset = 0;
+	register int npset = 0;
 
 	task_id = 0;
 	if (queue_first(&all_psets) == 0)
@@ -83,7 +86,7 @@ db_lookup_task_thread(task, target_threa
 	thread_t target_thread;
 {
 	register thread_t thread;
-	register thread_id;
+	register int thread_id;
 
 	thread_id = 0;
 	if (queue_first(&task->thread_list) == 0)
@@ -105,11 +108,11 @@ int
 db_lookup_thread(target_thread)
 	thread_t target_thread;
 {
-	register thread_id;
+	register int thread_id;
 	register task_t task;
 	register processor_set_t pset;
-	register ntask = 0;
-	register npset = 0;
+	register int ntask = 0;
+	register int npset = 0;
 
 	if (queue_first(&all_psets) == 0)
 	    return(-1);
@@ -151,11 +154,11 @@ db_check_thread_address_valid(thread)
  */
 task_t
 db_lookup_task_id(task_id)
-	register task_id;
+	register int task_id;
 {
 	register task_t task;
 	register processor_set_t pset;
-	register npset = 0;
+	register int npset = 0;
 
 	if (task_id > DB_MAX_TASKID)
 	    return(TASK_NULL);
@@ -180,7 +183,7 @@ db_lookup_task_id(task_id)
 static thread_t
 db_lookup_thread_id(task, thread_id)
 	task_t	 task;
-	register thread_id;
+	register int thread_id;
 {
 	register thread_t thread;
 
@@ -228,7 +231,7 @@ db_get_next_thread(threadp, position)
  *	( it is called in entering DDB session )
  */
 void
-db_init_default_thread()
+db_init_default_thread(void)
 {
 	if (db_lookup_thread(db_default_thread) < 0) {
 	    db_default_thread = THREAD_NULL;
@@ -242,7 +245,7 @@ db_init_default_thread()
  * in the command line
  */
 /* ARGSUSED */
-int
+long
 db_set_default_thread(vp, valuep, flag)
 	struct db_variable *vp;
 	db_expr_t	*valuep;
@@ -267,7 +270,7 @@ db_set_default_thread(vp, valuep, flag)
 /*
  * convert $taskXXX[.YYY] type DDB variable to task or thread address
  */
-int
+long
 db_get_task_thread(vp, valuep, flag, ap)
 	struct db_variable	*vp;
 	db_expr_t		*valuep;