From owner-cvs-sys  Tue Feb  3 12:00:00 1998
Return-Path: <owner-cvs-sys>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id MAA23306
          for cvs-sys-outgoing; Tue, 3 Feb 1998 12:00:00 -0800 (PST)
          (envelope-from owner-cvs-sys)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA23265;
          Tue, 3 Feb 1998 11:59:50 -0800 (PST)
          (envelope-from bde@FreeBSD.org)
From: Bruce Evans <bde@FreeBSD.ORG>
Received: (from bde@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id LAA22518;
	Tue, 3 Feb 1998 11:57:46 -0800 (PST)
Date: Tue, 3 Feb 1998 11:57:46 -0800 (PST)
Message-Id: <199802031957.LAA22518@freefall.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
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

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