From owner-svn-src-all@FreeBSD.ORG  Tue Dec 10 15:36:29 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E86116FC;
 Tue, 10 Dec 2013 15:36:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4F2D160E;
 Tue, 10 Dec 2013 15:36:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAFaTTn096420;
 Tue, 10 Dec 2013 15:36:29 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAFaTON096418;
 Tue, 10 Dec 2013 15:36:29 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201312101536.rBAFaTON096418@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Tue, 10 Dec 2013 15:36:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259178 - in head/sys: conf dev/vt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 15:36:30 -0000

Author: ray
Date: Tue Dec 10 15:36:29 2013
New Revision: 259178
URL: http://svnweb.freebsd.org/changeset/base/259178

Log:
  Break build with error in case when both syscons and newcons are enabled.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/conf/options
  head/sys/dev/vt/vt.h

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Tue Dec 10 14:54:11 2013	(r259177)
+++ head/sys/conf/options	Tue Dec 10 15:36:29 2013	(r259178)
@@ -757,6 +757,9 @@ SC_NORM_REV_ATTR	opt_syscons.h
 SC_PIXEL_MODE		opt_syscons.h
 SC_RENDER_DEBUG		opt_syscons.h
 SC_TWOBUTTON_MOUSE	opt_syscons.h
+DEV_SC			opt_syscons.h
+DEV_VT			opt_syscons.h
+
 
 # teken terminal emulator options
 TEKEN_CONS25		opt_teken.h

Modified: head/sys/dev/vt/vt.h
==============================================================================
--- head/sys/dev/vt/vt.h	Tue Dec 10 14:54:11 2013	(r259177)
+++ head/sys/dev/vt/vt.h	Tue Dec 10 15:36:29 2013	(r259178)
@@ -49,6 +49,11 @@
 #include "opt_syscons.h"
 #include "opt_splash.h"
 
+#ifdef DEV_SC
+#error "Build with both syscons and vt is not supported. Please enable only \
+one 'device sc' or 'device vt'"
+#endif
+
 #ifndef	VT_MAXWINDOWS
 #ifdef	MAXCONS
 #define	VT_MAXWINDOWS	MAXCONS