summaryrefslogtreecommitdiffstats
path: root/tools/src/h5import/h5import.h
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-04 22:06:47 (GMT)
committerGitHub <noreply@github.com>2021-03-04 22:06:47 (GMT)
commit583e9d5c323996ffdcf9534302e865d30f871da4 (patch)
tree9b1188a9b1784b488aa105748505aeba9f405177 /tools/src/h5import/h5import.h
parent7b23ce1686cf3383bb8666f133cf5fa4f6282096 (diff)
downloadhdf5-583e9d5c323996ffdcf9534302e865d30f871da4.zip
hdf5-583e9d5c323996ffdcf9534302e865d30f871da4.tar.gz
hdf5-583e9d5c323996ffdcf9534302e865d30f871da4.tar.bz2
1 10 Merges from develop (#424)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge small changes from develop * Minor non-space formatting changes * #386 copyright corrections for java folder * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merge updates #358 patches from vtk #361 fix header guard spelling * format fix * Fix missing underscore and make H5public.h closer to dev * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings header guard underscore cleanup JNI cleanup * format alignment * Add missing test ref file
Diffstat (limited to 'tools/src/h5import/h5import.h')
-rw-r--r--tools/src/h5import/h5import.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/src/h5import/h5import.h b/tools/src/h5import/h5import.h
index 2192f4a..efd40e1 100644
--- a/tools/src/h5import/h5import.h
+++ b/tools/src/h5import/h5import.h
@@ -17,8 +17,8 @@
*
*/
-#ifndef H5IMPORT_H__
-#define H5IMPORT_H__
+#ifndef H5IMPORT_H
+#define H5IMPORT_H
/*
* state table tokens
@@ -189,4 +189,4 @@ void help(char *);
hid_t createOutputDataType(struct Input *in);
hid_t createInputDataType(struct Input *in);
-#endif /* H5IMPORT_H__ */
+#endif /* H5IMPORT_H */