diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-24 10:10:03 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-03-02 20:55:17 +0200 |
| commit | 454c9e74c7c117274fb3612dc713f144088203bf (patch) | |
| tree | 3ff3f07bee8b48d5d05fbe5775bf8dc77ba344e7 | |
| parent | ba32d0fa40167766c2c4c2a83c7475bd3aed4258 (diff) | |
| download | illumos-joyent-454c9e74c7c117274fb3612dc713f144088203bf.tar.gz | |
13538 logadm: multiply-defined symbols
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
| -rw-r--r-- | usr/src/cmd/logadm/err.c | 1 | ||||
| -rw-r--r-- | usr/src/cmd/logadm/err.h | 4 | ||||
| -rw-r--r-- | usr/src/cmd/logadm/main.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/cmd/logadm/err.c b/usr/src/cmd/logadm/err.c index 5663232ec2..e1dc015899 100644 --- a/usr/src/cmd/logadm/err.c +++ b/usr/src/cmd/logadm/err.c @@ -34,6 +34,7 @@ #include <errno.h> #include "err.h" +jmp_buf Err_env; jmp_buf *Err_env_ptr; static const char *Myname; static int Exitcode; diff --git a/usr/src/cmd/logadm/err.h b/usr/src/cmd/logadm/err.h index de2abd9300..e712770511 100644 --- a/usr/src/cmd/logadm/err.h +++ b/usr/src/cmd/logadm/err.h @@ -50,7 +50,7 @@ void err_mailto(const char *recipient); #define EF_JMP 0x08 /* longjmp through Error_env after printing error */ #define EF_RAW 0x10 /* don't prepend/append anything to message */ -jmp_buf Err_env; +extern jmp_buf Err_env; extern jmp_buf *Err_env_ptr; #define SETJMP setjmp(*(Err_env_ptr = &Err_env)) @@ -70,7 +70,7 @@ void err_free(void *ptr, const char *fname, int line); #define STRDUP(ptr) err_strdup(ptr, __FILE__, __LINE__) char *err_strdup(const char *ptr, const char *fname, int line); -int Debug; /* replace with #define to zero to compile out Debug code */ +extern int Debug; /* replace with #define to zero to compile out Debug code */ #ifdef __cplusplus } diff --git a/usr/src/cmd/logadm/main.c b/usr/src/cmd/logadm/main.c index 624397d41f..2e14ca6ef4 100644 --- a/usr/src/cmd/logadm/main.c +++ b/usr/src/cmd/logadm/main.c @@ -82,6 +82,8 @@ static char *Chown = "/bin/chown"; static char *Gzip = "/bin/gzip"; static char *Mkdir = "/bin/mkdir"; +int Debug; + /* return from time(0), gathered early on to avoid slewed timestamps */ time_t Now; |