summaryrefslogtreecommitdiffstats
path: root/bin/sh/show.c
diff options
context:
space:
mode:
authorcracauer <cracauer@FreeBSD.org>2000-04-20 11:39:11 +0000
committercracauer <cracauer@FreeBSD.org>2000-04-20 11:39:11 +0000
commit0214561bf12b92f26daa81ca0fd0882c5f838aaa (patch)
tree6c4c546d31ae1bf10a4143a80aab9879fec36e7d /bin/sh/show.c
parent0732301c64cba8e39cfced1dd71aa44e4ff30b0e (diff)
downloadFreeBSD-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>
Diffstat (limited to 'bin/sh/show.c')
-rw-r--r--bin/sh/show.c5
1 files changed, 3 insertions, 2 deletions
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
{
OpenPOWER on IntegriCloud