Module Name: src
Committed By: roy
Date: Mon Apr 11 21:13:09 UTC 2011
Modified Files:
src/lib/libterminfo: term.h termcap.h
Log Message:
POSIX says that term.h should define tgetstr and friends
Fixes PR lib/43941
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libterminfo/term.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libterminfo/termcap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/term.h
diff -u src/lib/libterminfo/term.h:1.6 src/lib/libterminfo/term.h:1.7
--- src/lib/libterminfo/term.h:1.6 Wed Sep 22 06:10:51 2010
+++ src/lib/libterminfo/term.h Mon Apr 11 21:13:09 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: term.h,v 1.6 2010/09/22 06:10:51 roy Exp $ */
+/* $NetBSD: term.h,v 1.7 2011/04/11 21:13:09 roy Exp $ */
/*
- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Roy Marples.
@@ -1463,10 +1463,6 @@
__BEGIN_DECLS
extern TERMINAL *cur_term;
-#ifndef _TERMCAP_H
-extern short ospeed;
-extern char PC;
-#endif
/* setup functions */
int setupterm(const char *, int, int *);
@@ -1482,12 +1478,6 @@
char * tparm(const char *, long, long, long, long, long,
long, long, long, long);
-#ifndef _TERMCAP_H
-/* Output functions. */
-int putp(const char *);
-int tputs(const char *, int, int (*)(int));
-#endif
-
/* Non standard functions, but provide a level of thread safety */
int ti_setupterm(TERMINAL **, const char *, int, int *);
int ti_getflag(const TERMINAL *, const char *);
@@ -1516,5 +1506,8 @@
* The passed string is destroyed and the return string needs to be freed. */
char * captoinfo(char *);
+/* POSIX says that term.h should also pull in our termcap definitions. */
+#include <termcap.h>
+
__END_DECLS
#endif
Index: src/lib/libterminfo/termcap.h
diff -u src/lib/libterminfo/termcap.h:1.1 src/lib/libterminfo/termcap.h:1.2
--- src/lib/libterminfo/termcap.h:1.1 Wed Feb 3 15:16:32 2010
+++ src/lib/libterminfo/termcap.h Mon Apr 11 21:13:09 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: termcap.h,v 1.1 2010/02/03 15:16:32 roy Exp $ */
+/* $NetBSD: termcap.h,v 1.2 2011/04/11 21:13:09 roy Exp $ */
/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Roy Marples.
@@ -34,7 +34,6 @@
__BEGIN_DECLS
-#ifndef _TERM_H
/* Output functions.
* These are still valid for terminfo. */
int putp(const char *);
@@ -42,8 +41,6 @@
extern short ospeed;
extern char PC;
-#endif
-
extern char *BC;
extern char *UP;
