summaryrefslogtreecommitdiff
path: root/lib/libedit
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2012-05-30 18:21:14 +0000
committerchristos <christos@NetBSD.org>2012-05-30 18:21:14 +0000
commit7f4e4d89bd1619ef969f5426d652d39db38e04ca (patch)
tree05ddb0f1137652dbb0223f9012af09586bc61a56 /lib/libedit
parentf54bccfd436b216c25bdd0695bd22a29f1fd6f2a (diff)
don't include both term.h and termcap.h
Diffstat (limited to 'lib/libedit')
-rw-r--r--lib/libedit/terminal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libedit/terminal.c b/lib/libedit/terminal.c
index e33fa84ea52..c4a2543e496 100644
--- a/lib/libedit/terminal.c
+++ b/lib/libedit/terminal.c
@@ -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 @@ __RCSID("$NetBSD: terminal.c,v 1.13 2012/03/24 20:09:30 christos Exp $");
#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