1 10 merges from develop

[byrnHDF]

#358 patches from vtk
#361 fix header guard spelling

[byrnHDF]

I need help finding the error;
In file included from /home/byrn/HDF_Projects/hdf5/1.10/src/H5Fprivate.h:25,
from /home/byrn/HDF_Projects/hdf5/1.10/src/H5Bprivate.h:30,
from /home/byrn/HDF_Projects/hdf5/1.10/src/H5Gprivate.h:33,
from /home/byrn/HDF_Projects/hdf5/1.10/src/H5Lprivate.h:25,
from /home/byrn/HDF_Projects/hdf5/1.10/src/H5Plapl.c:37:
/home/byrn/HDF_Projects/hdf5/1.10/src/H5Fpublic.h:78:25: error: initializer element is not constant
78 | #define H5F_ACC_DEFAULT (H5CHECK H5OPEN 0xffffu) /* ignore setting on lapl /
| ^
/home/byrn/HDF_Projects/hdf5/1.10/src/H5Plapl.c:78:34: note: in expansion of macro ‘H5F_ACC_DEFAULT’
78 | #define H5L_ACS_ELINK_FLAGS_DEF H5F_ACC_DEFAULT
| ^~~~~~~~~~~~~~~
/home/byrn/HDF_Projects/hdf5/1.10/src/H5Plapl.c:167:5: note: in expansion of macro ‘H5L_ACS_ELINK_FLAGS_DEF’
167 | H5L_ACS_ELINK_FLAGS_DEF; / Default file access flags for external link traversal */
| ^~~~~~~~~~~~~~~~~~~~~~~

[byrnHDF]

src/H5Fpublic.h and src/H5private.h are the only files I can find with possible source changes that are involved with the error.
All the other file changes are mostly the elimination of the double underscore #ifndef guards.

[byrnHDF]

Fixed! H5Ppublic.h - missed a underscore in an include guard:
#undef H5OPEN
#ifndef H5private_H <----------
#define H5OPEN H5open(),
#else /* H5private_H /
#define H5OPEN
#endif / H5private_H */