From owner-p4-projects@FreeBSD.ORG  Tue Aug 12 22:47:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C4D21065670; Tue, 12 Aug 2008 22:47:47 +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 E4CA3106566B
	for <perforce@FreeBSD.org>; Tue, 12 Aug 2008 22:47:46 +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 D5D128FC12
	for <perforce@FreeBSD.org>; Tue, 12 Aug 2008 22:47:46 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7CMlkbv099443
	for <perforce@FreeBSD.org>; Tue, 12 Aug 2008 22:47:46 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7CMlkhk099441
	for perforce@freebsd.org; Tue, 12 Aug 2008 22:47:46 GMT
	(envelope-from ed@FreeBSD.org)
Date: Tue, 12 Aug 2008 22:47:46 GMT
Message-Id: <200808122247.m7CMlkhk099441@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 147273 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: Tue, 12 Aug 2008 22:47:47 -0000

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

Change 147273 by ed@ed_dull on 2008/08/12 22:47:19

	s/OXTABS/TAB3/

Affected files ...

.. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#4 edit
.. //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_ioctl.c#2 edit

Differences ...

==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#4 (text+ko) ====

@@ -398,7 +398,7 @@
 		lios->c_oflag |= LINUX_OPOST;
 	if (bios->c_oflag & ONLCR)
 		lios->c_oflag |= LINUX_ONLCR;
-	if (bios->c_oflag & OXTABS)
+	if (bios->c_oflag & TAB3)
 		lios->c_oflag |= LINUX_XTABS;
 
 	lios->c_cflag = bsd_to_linux_speed(bios->c_ispeed, sptab);
@@ -540,7 +540,7 @@
 	if (lios->c_oflag & LINUX_ONLCR)
 		bios->c_oflag |= ONLCR;
 	if (lios->c_oflag & LINUX_XTABS)
-		bios->c_oflag |= OXTABS;
+		bios->c_oflag |= TAB3;
 
 	bios->c_cflag = (lios->c_cflag & LINUX_CSIZE) << 4;
 	if (lios->c_cflag & LINUX_CSTOPB)

==== //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_ioctl.c#2 (text+ko) ====

@@ -169,7 +169,7 @@
 	l = st->c_oflag;	r = 0;
 	if (l & IBCS2_OPOST)	r |= OPOST;
 	if (l & IBCS2_ONLCR)	r |= ONLCR;
-	if (l & IBCS2_TAB3)	r |= OXTABS;
+	if (l & IBCS2_TAB3)	r |= TAB3;
 	bt->c_oflag = r;
 
 	l = st->c_cflag;	r = 0;
@@ -263,7 +263,7 @@
 	l = bt->c_oflag;	r = 0;
 	if (l & OPOST)		r |= IBCS2_OPOST;
 	if (l & ONLCR)		r |= IBCS2_ONLCR;
-	if (l & OXTABS)		r |= IBCS2_TAB3;
+	if (l & TAB3)		r |= IBCS2_TAB3;
 	st->c_oflag = r;
 
 	l = bt->c_cflag;	r = 0;