summaryrefslogtreecommitdiffstats
path: root/src/H5Fpublic.h
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-03 20:15:29 (GMT)
committerGitHub <noreply@github.com>2021-03-03 20:15:29 (GMT)
commitc1da03ef099fdc898e205bf5f80f328daf795421 (patch)
tree4303cc7574140b82824855b04887b69a77f1ec3c /src/H5Fpublic.h
parentd1475f524507186ad393ae2f1a93fba8126a4881 (diff)
downloadhdf5-c1da03ef099fdc898e205bf5f80f328daf795421.zip
hdf5-c1da03ef099fdc898e205bf5f80f328daf795421.tar.gz
hdf5-c1da03ef099fdc898e205bf5f80f328daf795421.tar.bz2
1 8 Merges from develop (#418)
* Update supported platforms * Merge PR#3 changes from develop * # WARNING: head commit changed in the meantime Merge gcc 10 diagnostics option from develop Merge CMake changes from develop Merge warnings from develop Merge #318 OSX changes from develop Merge tools changes from develop Merge test macros from develop * Format updates * Fix missing semicolon and format fix * Format update * Correct actions, remove java option * Update autotools build files * Add testfiles * Fix configure issue with make flags * Init fapls to default * Update generated files and fix h5repack id closure * update format * Merges from develop #358 patches from vtk #361 fix header guard spelling
Diffstat (limited to 'src/H5Fpublic.h')
-rw-r--r--src/H5Fpublic.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index c48bea0..574bf87 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -14,8 +14,8 @@
/*
* This file contains public declarations for the H5F module.
*/
-#ifndef _H5Fpublic_H
-#define _H5Fpublic_H
+#ifndef H5Fpublic_H
+#define H5Fpublic_H
/* Public header files needed by this file */
#include "H5public.h"
@@ -24,11 +24,11 @@
/* When this header is included from a private header, don't make calls to H5check() */
#undef H5CHECK
-#ifndef _H5private_H
+#ifndef H5private_H
#define H5CHECK H5check(),
-#else /* _H5private_H */
+#else /* H5private_H */
#define H5CHECK
-#endif /* _H5private_H */
+#endif /* H5private_H */
/*
* These are the bits that can be passed to the `flags' argument of
@@ -185,4 +185,4 @@ H5_DLL herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag);
#ifdef __cplusplus
}
#endif
-#endif /* _H5Fpublic_H */
+#endif /* H5Fpublic_H */