From 461fb44a229a70a5a853e636483281102b85a18b Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Tue, 12 May 2020 12:06:39 -0600 Subject: [PATCH] Fix duplicate definition in ocprint re: Issue https://github.com/Unidata/netcdf-c/issues/1725 The program ncdump/ocprint has a duplicate definition of the variable ocdebug. Convert to an extern definition since it is define in oc2 code. --- ncdump/Makefile.am | 3 --- ncdump/ocprint.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am index 3e6b96d99b..3d1d0a2bad 100644 --- a/ncdump/Makefile.am +++ b/ncdump/Makefile.am @@ -50,9 +50,6 @@ noinst_PROGRAMS += ocprint ocprint_SOURCES = ocprint.c endif -noinst_PROGRAMS += ncdumpchunks -ncdumpchunks_SOURCES = ncdumpchunks.c - # This is the man page. man_MANS = ncdump.1 nccopy.1 diff --git a/ncdump/ocprint.c b/ncdump/ocprint.c index d429181b4a..039634ad5b 100644 --- a/ncdump/ocprint.c +++ b/ncdump/ocprint.c @@ -56,7 +56,7 @@ char* optarg; /*Mnemonic*/ #define TOPLEVEL 1 -int ocdebug; +EXTERNL int ocdebug; static OCerror ocstat; static OClink glink;