From owner-p4-projects@FreeBSD.ORG  Wed Jul 16 12:39:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 11BCA106567F; Wed, 16 Jul 2008 12:39:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C86B2106567D
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 12:39:23 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BA9628FC24
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 12:39:23 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6GCdNw9043887
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 12:39:23 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6GCdNY3043885
	for perforce@freebsd.org; Wed, 16 Jul 2008 12:39:23 GMT
	(envelope-from ed@FreeBSD.org)
Date: Wed, 16 Jul 2008 12:39:23 GMT
Message-Id: <200807161239.m6GCdNY3043885@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145326 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jul 2008 12:39:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=145326

Change 145326 by ed@ed_dull on 2008/07/16 12:38:48

	Revert some of the changes to <sys/termios.h> to keep it more in
	sync with the vendor source.

Affected files ...

.. //depot/projects/mpsafetty/sys/sys/termios.h#2 edit

Differences ...

==== //depot/projects/mpsafetty/sys/sys/termios.h#2 (text+ko) ====

@@ -109,9 +109,6 @@
 #ifndef _POSIX_SOURCE
 #define ONLCR		0x00000002	/* map NL to CR-NL (ala CRMOD) */
 #define OXTABS		0x00000004	/* expand tabs to spaces */
-#ifndef _KERNEL
-#define	TAB3		OXTABS
-#endif /* !_KERNEL */
 #define ONOEOT		0x00000008	/* discard EOT's (^D) on output) */
 #define OCRNL		0x00000010	/* map CR to NL on output */
 #define ONOCR		0x00000020	/* no CR output at column 0 */
@@ -254,9 +251,6 @@
 #define TCION		4
 
 #include <sys/cdefs.h>
-#ifndef _POSIX_SOURCE
-#include <sys/ttycom.h>
-#endif
 
 __BEGIN_DECLS
 speed_t	cfgetispeed(const struct termios *);
@@ -282,6 +276,16 @@
 
 #endif /* !_KERNEL */
 
+#ifndef _POSIX_SOURCE
+
+/*
+ * Include tty ioctl's that aren't just for backwards compatibility
+ * with the old tty driver.  These ioctl definitions were previously
+ * in <sys/ioctl.h>.
+ */
+#include <sys/ttycom.h>
+#endif
+
 /*
  * END OF PROTECTED INCLUDE.
  */