summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/sh/shell.h2
-rw-r--r--bin/sh/show.c5
-rw-r--r--bin/sh/show.h2
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 *));
OpenPOWER on IntegriCloud