Fixed conflicts between <machine/console.h> and <machine/pcvt_ioctl.h>,

so that it is possible for kdump and truss to include them both.  Use
#defines from pcvt_ioctl.h in conflicting cases, since pcvt_ioctl.h
gives a hint about the bogus third arg to _IO().  Ifdef the common
typedefs.  Export `struct key_t' from pcvt_ioctl.h so pcvt_ioctl.h is
bug for bug compatible with console.h (now both are broken in C++
mode).

1 files changed, 13 insertions, 5 deletions

diff --git a/sys/i386/include/pcvt_ioctl.h b/sys/i386/include/pcvt_ioctl.h
index ac26796..08b7712 100644
--- a/sys/i386/include/pcvt_ioctl.h
+++ b/sys/i386/include/pcvt_ioctl.h
@@ -548,6 +548,8 @@ struct pcvtinfo {			/* compile time option values */
 #define VT_WAITACTIVE	_IO('v', 6 /*, int */)
 #define VT_GETACTIVE	_IOR('v', 7, int)
 
+#ifndef _VT_MODE_DECLARED
+#define	_VT_MODE_DECLARED
 struct vt_mode {
 	char	mode;
 
@@ -561,20 +563,26 @@ struct vt_mode {
 };
 
 typedef struct vt_mode vtmode_t;
+#endif /* !_VT_MODE_DECLARED */
 
 #define NUM_KEYS	256
 #define NUM_STATES	8
 
+#ifndef _KEYMAP_DECLARED
+#define	_KEYMAP_DECLARED
+struct key_t {
+	u_char map[NUM_STATES];
+	u_char spcl;
+	u_char flgs;
+};
+
 struct keymap {
 	u_short	n_keys;
-	struct key_t {
-		u_char map[NUM_STATES];
-		u_char spcl;
-		u_char flgs;
-	} key[NUM_KEYS];
+	struct key_t key[NUM_KEYS];
 };
 
 typedef struct keymap keymap_t;
+#endif /* !_KEYMAP_DECLARED */
 
 /* end of USL VT compatibility stuff */