Module Name: src
Committed By: christos
Date: Wed May 30 18:21:14 UTC 2012
Modified Files:
src/lib/libedit: terminal.c
Log Message:
don't include both term.h and termcap.h
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libedit/terminal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.13 src/lib/libedit/terminal.c:1.14
--- src/lib/libedit/terminal.c:1.13 Sat Mar 24 16:09:30 2012
+++ src/lib/libedit/terminal.c Wed May 30 14:21:14 2012
@@ -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
#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
