diff options
| author | cracauer <cracauer@FreeBSD.org> | 2000-04-20 11:39:11 +0000 |
|---|---|---|
| committer | cracauer <cracauer@FreeBSD.org> | 2000-04-20 11:39:11 +0000 |
| commit | 0214561bf12b92f26daa81ca0fd0882c5f838aaa (patch) | |
| tree | 6c4c546d31ae1bf10a4143a80aab9879fec36e7d | |
| parent | 0732301c64cba8e39cfced1dd71aa44e4ff30b0e (diff) | |
| download | FreeBSD-src-0214561bf12b92f26daa81ca0fd0882c5f838aaa.zip FreeBSD-src-0214561bf12b92f26daa81ca0fd0882c5f838aaa.tar.gz | |
Rename the trace() function (that is build only in the -DDEBUG=2
case), so that it doesn't clash with the ncurses function of the same
name when linking statically with -ltermcap.
The linker only complains when -static is used, and it is not clear
whether this is a bug.
PR: bin/18104
Submitted by: Anatoly Vorobey <mellon@pobox.com>
| -rw-r--r-- | bin/sh/shell.h | 2 | ||||
| -rw-r--r-- | bin/sh/show.c | 5 | ||||
| -rw-r--r-- | bin/sh/show.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/bin/sh/shell.h b/bin/sh/shell.h index 5939df7..0d00a91 100644 --- a/bin/sh/shell.h +++ b/bin/sh/shell.h @@ -77,7 +77,7 @@ extern char nullstr[1]; /* null string */ #ifdef DEBUG -#define TRACE(param) trace param +#define TRACE(param) sh_trace param #else #define TRACE(param) #endif diff --git a/bin/sh/show.c b/bin/sh/show.c index a784985..4abc4c0 100644 --- a/bin/sh/show.c +++ b/bin/sh/show.c @@ -51,6 +51,7 @@ static const char rcsid[] = #if DEBUG == 2 #include <errno.h> #endif +#include <errno.h> #include "shell.h" #include "parser.h" @@ -304,9 +305,9 @@ trputc(c) void #ifdef __STDC__ -trace(const char *fmt, ...) +sh_trace(const char *fmt, ...) #else -trace(va_alist) +sh_trace(va_alist) va_dcl #endif { diff --git a/bin/sh/show.h b/bin/sh/show.h index 1b6cbbc..837d21c 100644 --- a/bin/sh/show.h +++ b/bin/sh/show.h @@ -36,7 +36,7 @@ void showtree __P((union node *)); #ifdef DEBUG -void trace __P((const char *, ...)); +void sh_trace __P((const char *, ...)); void trargs __P((char **)); void trputc __P((int)); void trputs __P((char *)); |
