--- Gnu-Mach/kern/counters.h	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/kern/counters.h	2020/09/02 04:47:44	1.1.1.4
@@ -1,25 +1,25 @@
-/* 
+/*
  * 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.
  */
@@ -27,8 +27,6 @@
 #ifndef	_KERN_COUNTERS_
 #define	_KERN_COUNTERS_
 
-#include <mach_counters.h>
-
 /*
  *	We can count various interesting events and paths.
  *
@@ -43,11 +41,11 @@
 
 #define counter(code)		counter_always(code)
 
-#else	MACH_COUNTERS
+#else	/* MACH_COUNTERS */
 
 #define counter(code)
 
-#endif	MACH_COUNTERS
+#endif	/* MACH_COUNTERS */
 
 /*
  *	We define the counters with individual integers,
@@ -57,13 +55,12 @@
 
 typedef unsigned int mach_counter_t;
 
+#if	MACH_COUNTERS
 extern mach_counter_t c_thread_invoke_hits;
 extern mach_counter_t c_thread_invoke_misses;
 extern mach_counter_t c_thread_invoke_csw;
 extern mach_counter_t c_thread_handoff_hits;
 extern mach_counter_t c_thread_handoff_misses;
-
-#if	MACH_COUNTERS
 extern mach_counter_t c_threads_current;
 extern mach_counter_t c_threads_max;
 extern mach_counter_t c_threads_min;
@@ -102,6 +99,6 @@ extern mach_counter_t c_net_thread_block
 extern mach_counter_t c_reaper_thread_block;
 extern mach_counter_t c_swapin_thread_block;
 extern mach_counter_t c_action_thread_block;
-#endif	MACH_COUNTERS
+#endif	/* MACH_COUNTERS */
 
-#endif	_KERN_COUNTERS_
+#endif	/* _KERN_COUNTERS_ */