From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 11:56:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E21071065670; Tue,  9 Dec 2008 11:56:50 +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 A60E81065675
	for <perforce@FreeBSD.org>; Tue,  9 Dec 2008 11:56:50 +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 9514F8FC17
	for <perforce@FreeBSD.org>; Tue,  9 Dec 2008 11:56:50 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9Buov7034513
	for <perforce@FreeBSD.org>; Tue, 9 Dec 2008 11:56:50 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9Buoht034511
	for perforce@freebsd.org; Tue, 9 Dec 2008 11:56:50 GMT
	(envelope-from ed@FreeBSD.org)
Date: Tue, 9 Dec 2008 11:56:50 GMT
Message-Id: <200812091156.mB9Buoht034511@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 154394 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, 09 Dec 2008 11:56:51 -0000

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

Change 154394 by ed@ed_dull on 2008/12/09 11:55:51

	Don't use FG_BLINK and FG_UNDERLINE unconditionally. Allow
	platforms to omit the definitions.

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#17 edit

Differences ...

==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#17 (text+ko) ====

@@ -235,10 +235,14 @@
 		attr |= fgcolors_normal[a->ta_fgcolor];
 	attr |= bgcolors[a->ta_bgcolor];
 
+#ifdef FG_UNDERLINE
 	if (a->ta_format & TF_UNDERLINE)
 		attr |= FG_UNDERLINE;
+#endif /* FG_UNDERLINE */
+#ifdef FG_BLINK
 	if (a->ta_format & TF_BLINK)
 		attr |= FG_BLINK;
+#endif /* FG_BLINK */
 
 	return (attr << 8);
 }