Fix incorrect preprocessor conditional and variable scope.

src/pio_server.c

@@ -1810,8 +1810,9 @@ cdiPioServerStreamClose(stream_t *streamptr, int recordBufIsToBeDeleted)
   void (*streamCloseCallBack)(int streamID) = (void (*)(int)) conf->callbacks[CDIPIO_CALLBACK_POSTSTREAMCLOSE];
   streamCloseCallBack(streamptr->self);
 }
+
 #if defined HAVE_NC4HDF5 && defined HAVE_PARALLEL_NC4
-bool parH5ZeroCountProblem = false;
+static bool parH5ZeroCountProblem = false;
 #endif
 
 #ifdef HAVE_LIBNETCDF
@@ -1820,7 +1821,13 @@ cdiPioCdfDefTimestep(stream_t *streamptr, int tsID, size_t valCount)
 {
   int streamID = streamptr->self, rankOpen = cdiPioStream2Owner(streamID);
 #ifdef HAVE_PARALLEL_NC4
-  valCount = rankOpen != CDI_PIO_COLLECTIVE_OPEN || parH5ZeroCountProblem || commInqRankColl() == 0;
+  valCount = rankOpen != CDI_PIO_COLLECTIVE_OPEN
+#if defined HAVE_NC4HDF5
+             || (parH5ZeroCountProblem && streamptr->filetype == CDI_FILETYPE_NC4)
+#else
+             || streamptr->filetype == CDI_FILETYPE_NC4
+#endif
+             || commInqRankColl() == 0;
 #endif
   if (commInqIOMode() == PIO_NONE
 #ifdef HAVE_PARALLEL_NC4