From b22d00e9129b5cb2fee8da1592ca70eff2222f7e Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 24 May 2000 10:44:45 +0000 Subject: 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. --- contrib/ncurses/include/curses.h.in | 1 + contrib/ncurses/ncurses/trace/lib_trace.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/ncurses/include/curses.h.in b/contrib/ncurses/include/curses.h.in index 4f300b0..3e52e40 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 aa4b887..0f47e16 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; -- cgit v1.1