From b0d8599cdab985a41de495bf1f4f1bb56cdbef3c Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Sun, 24 May 2020 14:58:51 +0300 Subject: 13540 ndmpd: multiply-defined symbols Reviewed by: C Fraire Reviewed by: Andy Fiddaman Approved by: Dan McDonald --- usr/src/cmd/ndmpd/include/tlm.h | 2 +- usr/src/cmd/ndmpd/ndmp/ndmpd_log.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'usr/src') diff --git a/usr/src/cmd/ndmpd/include/tlm.h b/usr/src/cmd/ndmpd/include/tlm.h index 8c667a334b..e5e045d89a 100644 --- a/usr/src/cmd/ndmpd/include/tlm.h +++ b/usr/src/cmd/ndmpd/include/tlm.h @@ -437,7 +437,7 @@ typedef struct tm_ops { #define LONGNAME_PREFIX "././_LoNg_NaMe_" extern void ndmp_log(ulong_t, char *, char *, ...); -char ndmp_log_info[256]; +extern char ndmp_log_info[256]; #define NDMP_LOG(p, ...) { \ (void) snprintf(ndmp_log_info, \ sizeof (ndmp_log_info), \ diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd_log.c b/usr/src/cmd/ndmpd/ndmp/ndmpd_log.c index 46c0d2d331..73ecf1eae1 100644 --- a/usr/src/cmd/ndmpd/ndmp/ndmpd_log.c +++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_log.c @@ -65,12 +65,12 @@ #define LOG_FILE_SIZE 4 * 1024 * 1024 #define LOG_SIZE_INT 256 +char ndmp_log_info[256]; static boolean_t debug = B_FALSE; static boolean_t log_to_stderr = B_FALSE; static FILE *logfp; static int ndmp_synclog = 1; - /* * Since we use buffered file I/O for log file, the thread may lose CPU. * At this time, another thread can destroy the contents of the buffer -- cgit v1.2.3