aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2000-05-24 10:44:45 +0000
committerPeter Wemm <peter@FreeBSD.org>2000-05-24 10:44:45 +0000
commit6b9085fd58b7602b14be0cd2059285baa764a7ee (patch)
treefdceab13840fe4133003a1a7a582be4ceb304398 /contrib/ncurses
parent1759abf3ae1a38b7578df7996346544b66e508ad (diff)
downloadsrc-6b9085fd58b7602b14be0cd2059285baa764a7ee.tar.gz
src-6b9085fd58b7602b14be0cd2059285baa764a7ee.zip
Bring in the fix for the trace/_nc_trace issue, without breaking the
vendor branching. The author has fixed this also so we can do this safely.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=60867
Diffstat (limited to 'contrib/ncurses')
-rw-r--r--contrib/ncurses/include/curses.h.in1
-rw-r--r--contrib/ncurses/ncurses/trace/lib_trace.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/ncurses/include/curses.h.in b/contrib/ncurses/include/curses.h.in
index 4f300b0b9aed..3e52e40564ed 100644
--- a/contrib/ncurses/include/curses.h.in
+++ b/contrib/ncurses/include/curses.h.in
@@ -1313,6 +1313,7 @@ extern char *_tracechar(const unsigned char);
extern char *_tracechtype(chtype);
extern char *_tracechtype2(int, chtype);
extern char *_tracemouse(const MEVENT *);
+#define trace _nc_trace
extern void trace(const unsigned int);
/* trace masks */
diff --git a/contrib/ncurses/ncurses/trace/lib_trace.c b/contrib/ncurses/ncurses/trace/lib_trace.c
index aa4b887111a7..0f47e16e698f 100644
--- a/contrib/ncurses/ncurses/trace/lib_trace.c
+++ b/contrib/ncurses/ncurses/trace/lib_trace.c
@@ -54,7 +54,7 @@ long _nc_outchars;
static FILE * tracefp; /* default to writing to stderr */
#endif
-void trace(const unsigned int tracelevel GCC_UNUSED)
+void _nc_trace(const unsigned int tracelevel GCC_UNUSED)
{
#ifdef TRACE
static bool been_here = FALSE;