mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-21 08:39:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2635 from DennisHeimbigner/vfd13.dmh

Browse Source 
Extend the dispatch table for H5FD back to version 1.13.2
This commit is contained in:
Ward Fisher 2023-03-14 11:36:17 -06:00 committed by GitHub
commit 97dbb4f25b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_NOTES.md
View File

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

6
libhdf5/H5FDhttp.c
View File

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

2
libhdf5/H5FDhttp.h
View File

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