--- Gnu-Mach/kern/xpr.h	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/kern/xpr.h	2020/09/02 04:47:37	1.1.1.4
@@ -1,58 +1,56 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 /*
- * Include file for xpr circular buffer silent tracing.  
+ * Include file for xpr circular buffer silent tracing.
  *
  */
 /*
- * If the kernel flag XPRDEBUG is set, the XPR macro is enabled.  The 
+ * If the kernel flag XPRDEBUG is set, the XPR macro is enabled.  The
  * macro should be invoked something like the following:
  *	XPR(XPR_SYSCALLS, ("syscall: %d, 0x%x\n", syscallno, arg1);
  * which will expand into the following code:
  *	if (xprflags & XPR_SYSCALLS)
  *		xpr("syscall: %d, 0x%x\n", syscallno, arg1);
- * Xpr will log the pointer to the printf string and up to 6 arguements,
+ * Xpr will log the pointer to the printf string and up to 6 arguments,
  * along with a timestamp and cpuinfo (for multi-processor systems), into
  * a circular buffer.  The actual printf processing is delayed until after
  * the buffer has been collected.  It is assumed that the text/data segments
  * of the kernel can easily be reconstructed in a post-processor which
  * performs the printf processing.
  *
- * If the XPRDEBUG compilation switch is not set, the XPR macro expands 
+ * If the XPRDEBUG compilation switch is not set, the XPR macro expands
  * to nothing.
  */
 
 #ifndef	_KERN_XPR_H_
 #define _KERN_XPR_H_
 
-#ifdef	KERNEL
-#include <xpr_debug.h>
-#else	KERNEL
+#ifndef	KERNEL
 #include <sys/features.h>
-#endif	KERNEL
+#endif	/* KERNEL */
 
 #include <machine/xpr.h>
 
@@ -80,9 +78,9 @@ extern int xprflags;
 #define	XPR_INODE_PAGER		(1 << 14)
 #define	XPR_INODE_PAGER_DATA	(1 << 15)
 
-#else	XPR_DEBUG
+#else	/* XPR_DEBUG */
 #define XPR(flags,xprargs)
-#endif	XPR_DEBUG
+#endif	/* XPR_DEBUG */
 
 struct xprbuf {
 	char 	*msg;
@@ -91,11 +89,9 @@ struct xprbuf {
 	int	cpuinfo;
 };
 
-#ifndef WANT_PROTOTYPES
-extern void xpr();
-#endif
-extern void xpr_dump();
-extern void xprinit();
-extern void xprbootstrap();
+extern void xpr(char *, int, int, int, int, int);
+extern void xpr_dump(struct xprbuf *, int);
+extern void xprinit(void);
+extern void xprbootstrap(void);
 
-#endif _KERN_XPR_H_
+#endif /* _KERN_XPR_H_ */