From 147fa0fa28f5b767e9682b0a90fa0e35b1d6eca0 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Fri, 13 Dec 1996 13:12:02 +0000
Subject: [PATCH] Hack around misuse of reserved names `clock' and and `time'
 in a different way.  Defining KERNEL before including <sys/time.h> broke when
 "opt_cpu.h" was included in a deeply nested header, except in -current where
 the problem is masked by a namespace pollution bug in <stdio.h>.

---
 games/battlestar/com6.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/games/battlestar/com6.c b/games/battlestar/com6.c
index 4f24cd37d175..a7fa41ee1818 100644
--- a/games/battlestar/com6.c
+++ b/games/battlestar/com6.c
@@ -90,12 +90,14 @@ live()
 }
 
 /*
- * sigh -- this program thinks "time" is an int.  It's easier to not load
- * <time.h> than try and fix it.
+ * sigh -- this program thinks `clock' and `time' are ints.  It's easier
+ * to hack around this than to fix it properly.
  */
-#define KERNEL
+#define	clock	not_our_clock
+#define	time	not_our_time
 #include <sys/time.h>
-#undef KERNEL
+#undef clock
+#undef time
 
 post(ch)
 char ch;