diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4cecbd1853..43959834d0 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,6 +7,9 @@ This file contains a high-level description of this package's evolution. Release ## 4.9.2 - TBD +* Fix 'make distcheck' error in run_interop.sh. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????). +* Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output. This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274). +* Update H5FDhttp.[ch] to work with HDF5 version 1.13.2 and later. See [Github #2635](https://github.com/Unidata/netcdf-c/pull/2635). * [Bug Fix] Update DAP code to enable CURLOPT_ACCEPT_ENCODING by default. See [Github #2630](https://github.com/Unidata/netcdf-c/pull/2630). * [Bug Fix] Fix byterange failures for certain URLs. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????). * [Bug Fix] Fix 'make distcheck' error in run_interop.sh. See [Github #2631](https://github.com/Unidata/netcdf-c/pull/2631). diff --git a/libhdf5/H5FDhttp.c b/libhdf5/H5FDhttp.c index 4b9c42e976..e004602523 100644 --- a/libhdf5/H5FDhttp.c +++ b/libhdf5/H5FDhttp.c @@ -162,7 +162,7 @@ static herr_t H5FD_http_unlock(H5FD_t *_file); /* Beware, not same as H5FD_HTTP_g */ static const H5FD_class_t H5FD_http_g = { -#if H5_VERSION_GE(1,14,0) +#if H5_VERSION_GE(1,13,2) H5FD_CLASS_VERSION, /* struct version */ H5_VFD_HTTP, /* value */ #endif @@ -195,7 +195,7 @@ static const H5FD_class_t H5FD_http_g = { H5FD_http_get_handle, /* get_handle */ H5FD_http_read, /* read */ H5FD_http_write, /* write */ -#if H5_VERSION_GE(1,14,0) +#if H5_VERSION_GE(1,13,2) NULL, /* read_vector */ NULL, /* write_vector */ NULL, /* read_selection */ @@ -205,7 +205,7 @@ static const H5FD_class_t H5FD_http_g = { NULL, /* truncate */ H5FD_http_lock, /* lock */ H5FD_http_unlock, /* unlock */ -#if H5_VERSION_GE(1,14,0) +#if H5_VERSION_GE(1,13,2) NULL, /* del */ NULL, /* ctl */ #endif diff --git a/libhdf5/H5FDhttp.h b/libhdf5/H5FDhttp.h index 7794d57376..f3c46dca59 100644 --- a/libhdf5/H5FDhttp.h +++ b/libhdf5/H5FDhttp.h @@ -31,7 +31,7 @@ #include "H5Ipublic.h" -#if H5_VERSION_GE(1,14,0) +#if H5_VERSION_GE(1,13,2) #define H5_VFD_HTTP ((H5FD_class_value_t)(514)) #define H5FD_HTTP (H5FDperform_init(H5FD_http_init)) #else