mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-02-23 16:59:54 +08:00
changes from other branches to get CI to pass
This commit is contained in:
commit
72a7ddb15a
@ -964,7 +964,7 @@ nc4_create_file(const char *path, int cmode, size_t initialsz, void* parameters,
|
||||
/* ok */
|
||||
} else if ((cmode & NC_NOCLOBBER) && (fp = fopen(path, "r"))) {
|
||||
fclose(fp);
|
||||
return NC_EEXIST;
|
||||
BAIL(NC_EEXIST);
|
||||
}
|
||||
|
||||
/* Need this access plist to control how HDF5 handles open objects
|
||||
|
@ -20,9 +20,8 @@ redistribution conditions.
|
||||
#include "nc_tests.h"
|
||||
#include "err_macros.h"
|
||||
|
||||
#include <hdf5.h>
|
||||
|
||||
#ifdef USE_NETCDF4
|
||||
#include <hdf5.h>
|
||||
extern int H5Eprint1(FILE * stream);
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user