From b40f8ce36735e7431a70ffc7d37d1c0a60d66b7d Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 27 Feb 2023 16:07:36 -0700
Subject: [PATCH] Invert solution as discussed at
 https://github.com/Unidata/netcdf-c/pull/2618

---
 include/nc4internal.h  | 2 +-
 libhdf5/hdf5internal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/nc4internal.h b/include/nc4internal.h
index 2833e0c5a..86cb223fe 100644
--- a/include/nc4internal.h
+++ b/include/nc4internal.h
@@ -288,7 +288,7 @@ typedef struct NC_FILE_INFO
 {
     NC_OBJ hdr;
     NC *controller; /**< Pointer to containing NC. */
-#ifdef USE_PARALLEL4
+#ifdef USE_PARALLEL
     MPI_Comm comm;  /**< Copy of MPI Communicator used to open the file. */
     MPI_Info info;  /**< Copy of MPI Information Object used to open the file. */
 #endif
diff --git a/libhdf5/hdf5internal.c b/libhdf5/hdf5internal.c
index fa13ebbef..83add362d 100644
--- a/libhdf5/hdf5internal.c
+++ b/libhdf5/hdf5internal.c
@@ -163,7 +163,7 @@ find_var_dim_max_length(NC_GRP_INFO_T *grp, int varid, int dimid,
                 if (var->dimids[d] == dimid)
                     *maxlen = *maxlen > h5dimlen[d] ? *maxlen : h5dimlen[d];
 
-#ifdef USE_PARALLEL4
+#ifdef USE_PARALLEL
 	    /* If we are doing parallel I/O in collective mode (with
 	     * either pnetcdf or HDF5), then communicate with all
 	     * other tasks in the collective and find out which has