From owner-svn-soc-all@FreeBSD.ORG  Sat May 28 03:13:11 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id BAA251065670
	for <svn-soc-all@FreeBSD.org>; Sat, 28 May 2011 03:13:09 +0000 (UTC)
	(envelope-from zy@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sat, 28 May 2011 03:13:09 +0000
Date: Sat, 28 May 2011 03:13:09 +0000
From: zy@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110528031309.BAA251065670@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222496 - soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 May 2011 03:13:12 -0000

Author: zy
Date: Sat May 28 03:13:09 2011
New Revision: 222496
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222496

Log:
  Uses the HAVE_TERM_H to handle the problem suggested by r170399

Modified:
  soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl_screen.c

Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl_screen.c
==============================================================================
--- soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl_screen.c	Sat May 28 00:58:19 2011	(r222495)
+++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/cl/cl_screen.c	Sat May 28 03:13:09 2011	(r222496)
@@ -25,8 +25,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_TERM_H
 #include <term.h>
+#else
 #include <termios.h>
+#endif
 #include <unistd.h>
 
 #include "../common/common.h"