This Pre removed #include <netcdf.h> from netcdf_mem.h.

In turn that caused some problems elsewhere because some files
did not include netcdf.h preceding netcdf_mem.h. Specifically,
building under visual studio fails.
So fix those cases that I can find. May need to
add more later.

include/nc3internal.h

@@ -16,10 +16,9 @@
 #  include <stdint.h>
 #endif /* HAVE_STDINT_H */
 #include <sys/types.h>	/* off_t */
+#include "netcdf.h"
 #ifdef USE_PARALLEL
 #include "netcdf_par.h"
-#else
-#include "netcdf.h"
 #endif /* USE_PARALLEL */
 
 /* Always needed */

include/nc4internal.h

@@ -20,7 +20,6 @@
 
 #include "ncdimscale.h"
 #include "nc_logging.h"
-#include "netcdf_mem.h"
 #include "ncindex.h"
 
 #ifdef USE_PARALLEL
@@ -28,6 +27,7 @@
 #endif /* USE_PARALLEL */
 #include "netcdf.h"
 #include "netcdf_f.h"
+#include "netcdf_mem.h"
 
 /* Always needed */
 #include "nc.h"

include/ncdispatch.h

@@ -19,12 +19,12 @@
 #if defined(HDF5_PARALLEL) || defined(USE_PNETCDF)
 #include <mpi.h>
 #endif
-#ifdef USE_PARALLEL
-#include "netcdf_par.h"
-#endif
 #include "netcdf.h"
 #include "nc.h"
 #include "ncuri.h"
+#ifdef USE_PARALLEL
+#include "netcdf_par.h"
+#endif
 
 #define longtype ((sizeof(long) == sizeof(int) ? NC_INT : NC_INT64))
 

nc_test/tst_diskless5.c

@@ -1,8 +1,5 @@
 /* Diskless test in support of https://github.com/Unidata/netcdf-c/issues/400 */
 
-
-
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>