svn commit: r259178 - in head/sys: conf dev/vt

[Aleksandr Rybalko]

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