mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nc_mpiio_nc_mpiposix

Browse Source
This commit is contained in:
Ward Fisher 2018-10-09 15:21:50 -06:00 committed by GitHub
commit ea66842bea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nc3internal.h
View File

@ -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 */

2
include/nc4internal.h
View File

@ -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"

6
include/ncdispatch.h
View File

@ -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))

2
include/netcdf_mem.h
View File

@ -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;

3
nc_test/tst_diskless5.c
View File

@ -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>