mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into s3update.dmh

Browse Source
This commit is contained in:
Dennis Heimbigner 2023-05-09 19:31:18 -06:00
commit d79f08176a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -2222,7 +2222,7 @@ ENDIF(ENABLE_BASH_SCRIPT_TESTING)
MACRO(add_sh_test prefix F)
IF(HAVE_BASH)
ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}/${F}.sh ${F}.sh ${ARGN}")
ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}/${F}.sh ${ARGN}")
ENDIF()
ENDMACRO()

2
libhdf5/hdf5open.c
View File

@ -2642,7 +2642,7 @@ oinfo_list_add(user_data_t *udata, const hdf5_obj_info_t *oinfo)
*/
static int
read_hdf5_obj(hid_t grpid, const char *name,
#if H5_VERSION_GE(1,12,0)
#if defined(H5Lget_info_vers) && H5Lget_info_vers == 2
const H5L_info2_t *info,
#else
const H5L_info_t *info,