[src/trunk]: src/lib/libedit don't include both term.h and termcap.h

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5294da128b49
branches:  trunk
changeset: 779483:5294da128b49
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 30 18:21:14 2012 +0000

description:
don't include both term.h and termcap.h

diffstat:

 lib/libedit/terminal.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 51832d6ec426 -r 5294da128b49 lib/libedit/terminal.c
--- a/lib/libedit/terminal.c    Wed May 30 18:01:51 2012 +0000
+++ b/lib/libedit/terminal.c    Wed May 30 18:21:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: terminal.c,v 1.13 2012/03/24 20:09:30 christos Exp $   */
+/*     $NetBSD: terminal.c,v 1.14 2012/05/30 18:21:14 christos Exp $   */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)term.c     8.2 (Berkeley) 4/30/95";
 #else
-__RCSID("$NetBSD: terminal.c,v 1.13 2012/03/24 20:09:30 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.14 2012/05/30 18:21:14 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -62,7 +62,7 @@
 #endif
 
 /* Solaris's term.h does horrid things. */
-#if defined(HAVE_TERM_H) && !defined(__sun)
+#if defined(HAVE_TERM_H) && !defined(__sun) && !defined(HAVE_TERMCAP_H)
 #include <term.h>
 #endif