changes from other branches to get CI to pass

This commit is contained in:
Ed Hartnett 2018-05-16 10:03:24 -06:00
commit 72a7ddb15a
2 changed files with 2 additions and 3 deletions

View File

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

View File

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