From b8784109249d1b00bc2c35c6721e165e0741795c Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Fri, 29 May 1998 00:41:06 +0000
Subject: protect from multiple define collisions w/ pccons.h pccons.h must be
 included first (for historical reasons ;)

---
 sys/arch/i386/isa/pcvt/pcvt_ioctl.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'sys/arch/i386')

diff --git a/sys/arch/i386/isa/pcvt/pcvt_ioctl.h b/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
index 112d836f35d..cc6bb8602f0 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_ioctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcvt_ioctl.h,v 1.8 1998/03/28 09:36:43 deraadt Exp $	*/
+/*	$OpenBSD: pcvt_ioctl.h,v 1.9 1998/05/29 00:41:05 mickey Exp $	*/
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -485,11 +485,17 @@ struct pcvtinfo {			/* compile time option values */
  * this header file.
  */
 
+#ifndef CONSOLE_X_MODE_ON
 #define CONSOLE_X_MODE_ON   _IO('t', 121) /* turn off pcvt, grant IOPL for X */
+#endif
 
+#ifndef CONSOLE_X_MODE_OFF
 #define CONSOLE_X_MODE_OFF  _IO('t', 122) /* back to pcvt */
+#endif
 
+#ifndef CONSOLE_X_BELL
 #define CONSOLE_X_BELL      _IOW('t', 123, int[2]) /* set bell behaviour */
+#endif
 
 /*
  * start of USL VT compatibility stuff
-- 
cgit v1.2.3