summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-05-22 08:54:07 +0300
committerToomas Soome <tsoome@me.com>2021-02-14 23:28:42 +0200
commite860a055849021760ba50651d1d9d174f9ecd8c6 (patch)
tree7e7397de21637077730ac6ce2cb8315f7fadc13d
parent1502345d2f71778fdc0a78f6530cd512c93223d3 (diff)
downloadillumos-joyent-e860a055849021760ba50651d1d9d174f9ecd8c6.tar.gz
13529 dis: symbol 'g_error' is multiply-defined
Reviewed by: Robert Mustacchi <rm@fingolfin.org> Reviewed by: Yuri Pankov <yuripv@yuripv.dev> Approved by: Richard Lowe <richlowe@richlowe.net>
-rw-r--r--usr/src/cmd/dis/dis_util.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/cmd/dis/dis_util.h b/usr/src/cmd/dis/dis_util.h
index e3506c9cab..45e2783d85 100644
--- a/usr/src/cmd/dis/dis_util.h
+++ b/usr/src/cmd/dis/dis_util.h
@@ -27,8 +27,6 @@
#ifndef _DIS_UTIL_H
#define _DIS_UTIL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#ifdef __cplusplus
@@ -41,7 +39,7 @@ void warn(const char *, ...);
void *safe_malloc(size_t);
const char *dis_demangle(const char *);
-int g_error;
+extern int g_error;
#define BUFSIZE 1024