Merge pull request #1149 from Unidata/netcdf_mem_fix.dmh

Remove unneeded include of netcdf.h from netcdf_mem.h
Unidata · Oct 9, 2018 · 6b0217f · 6b0217f
2 parents 266d3c5 + 534364b
commit 6b0217f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/include/nc3internal.h b/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 */

diff --git a/include/nc4internal.h b/include/nc4internal.h
@@ -20,14 +20,14 @@
 
 #include "ncdimscale.h"
 #include "nc_logging.h"
-#include "netcdf_mem.h"
 #include "ncindex.h"
 
 #ifdef USE_PARALLEL
 #include "netcdf_par.h"
 #endif /* USE_PARALLEL */
 #include "netcdf.h"
 #include "netcdf_f.h"
+#include "netcdf_mem.h"
 
 /* Always needed */
 #include "nc.h"

diff --git a/include/ncdispatch.h b/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))
 

diff --git a/include/netcdf_mem.h b/include/netcdf_mem.h
@@ -12,8 +12,6 @@
 #ifndef NETCDF_MEM_H
 #define NETCDF_MEM_H 1
 
-#include <netcdf.h>
-
 typedef struct NC_memio {
     size_t size;
     void* memory;

diff --git a/nc_test/tst_diskless5.c b/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>