Date: Tue, 3 Feb 1998 11:57:46 -0800 (PST) From: Bruce Evans <bde@FreeBSD.ORG> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG Subject: cvs commit: src/sys/i386/include console.h pcvt_ioctl.h Message-ID: <199802031957.LAA22518@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
bde 1998/02/03 11:57:46 PST
Modified files:
sys/i386/include console.h pcvt_ioctl.h
Log:
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).
Revision Changes Path
1.35 +24 -16 src/sys/i386/include/console.h
1.9 +13 -5 src/sys/i386/include/pcvt_ioctl.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199802031957.LAA22518>