From cbb487db93a39cd9bc9ce67e31ff29f8f418f44f Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Mon, 20 Nov 2000 22:00:25 +0000
Subject: [PATCH] Make programs which still #include
 <machine/{mouse,console}.h> fail at compiletime, with an explanatory error
 message.  Previously they would only get a warning.

These files will be finally removed 2001-01-15
---
 sys/alpha/include/console.h | 11 +----------
 sys/alpha/include/mouse.h   |  4 +---
 sys/i386/include/console.h  | 12 +-----------
 sys/i386/include/mouse.h    |  4 +---
 sys/ia64/include/console.h  | 12 +-----------
 sys/ia64/include/mouse.h    |  4 +---
 6 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h
index 79ff98f6a3a..2a9f36966ea 100644
--- a/sys/alpha/include/console.h
+++ b/sys/alpha/include/console.h
@@ -1,14 +1,5 @@
 /* $FreeBSD$ */
-
-#ifndef _MACHINE_CONSOLE_H_
-#define _MACHINE_CONSOLE_H_
-
 #if __GNUC__
-#warning "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead"
+#error "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead"
 #endif
 
-#include <sys/fbio.h>
-#include <sys/kbio.h>
-#include <sys/consio.h>
-
-#endif /* !_MACHINE_CONSOLE_H_ */
diff --git a/sys/alpha/include/mouse.h b/sys/alpha/include/mouse.h
index b1f513058e5..1aded0d3ee2 100644
--- a/sys/alpha/include/mouse.h
+++ b/sys/alpha/include/mouse.h
@@ -1,6 +1,4 @@
 /* $FreeBSD$ */
 #if __GNUC__
-#warning "this file includes <machine/mouse.h> which is deprecated, use <sys/mouse.h> instead"
+#error "this file includes <machine/mouse.h> which is deprecated, use <sys/mouse.h> instead"
 #endif
-
-#include <sys/mouse.h>
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h
index 79ff98f6a3a..399a04454c5 100644
--- a/sys/i386/include/console.h
+++ b/sys/i386/include/console.h
@@ -1,14 +1,4 @@
 /* $FreeBSD$ */
-
-#ifndef _MACHINE_CONSOLE_H_
-#define _MACHINE_CONSOLE_H_
-
 #if __GNUC__
-#warning "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead"
+#error "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead"
 #endif
-
-#include <sys/fbio.h>
-#include <sys/kbio.h>
-#include <sys/consio.h>
-
-#endif /* !_MACHINE_CONSOLE_H_ */
diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h
index b1f513058e5..1aded0d3ee2 100644
--- a/sys/i386/include/mouse.h
+++ b/sys/i386/include/mouse.h
@@ -1,6 +1,4 @@
 /* $FreeBSD$ */
 #if __GNUC__
-#warning "this file includes <machine/mouse.h> which is deprecated, use <sys/mouse.h> instead"
+#error "this file includes <machine/mouse.h> which is deprecated, use <sys/mouse.h> instead"
 #endif
-
-#include <sys/mouse.h>
diff --git a/sys/ia64/include/console.h b/sys/ia64/include/console.h
index 79ff98f6a3a..399a04454c5 100644
--- a/sys/ia64/include/console.h
+++ b/sys/ia64/include/console.h
@@ -1,14 +1,4 @@
 /* $FreeBSD$ */
-
-#ifndef _MACHINE_CONSOLE_H_
-#define _MACHINE_CONSOLE_H_
-
 #if __GNUC__
-#warning "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead"
+#error "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead"
 #endif
-
-#include <sys/fbio.h>
-#include <sys/kbio.h>
-#include <sys/consio.h>
-
-#endif /* !_MACHINE_CONSOLE_H_ */
diff --git a/sys/ia64/include/mouse.h b/sys/ia64/include/mouse.h
index b1f513058e5..1aded0d3ee2 100644
--- a/sys/ia64/include/mouse.h
+++ b/sys/ia64/include/mouse.h
@@ -1,6 +1,4 @@
 /* $FreeBSD$ */
 #if __GNUC__
-#warning "this file includes <machine/mouse.h> which is deprecated, use <sys/mouse.h> instead"
+#error "this file includes <machine/mouse.h> which is deprecated, use <sys/mouse.h> instead"
 #endif
-
-#include <sys/mouse.h>
-- 
2.45.2