diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-04 22:06:47 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 22:06:47 (GMT) |
commit | 583e9d5c323996ffdcf9534302e865d30f871da4 (patch) | |
tree | 9b1188a9b1784b488aa105748505aeba9f405177 /java/src/jni/h5lImp.h | |
parent | 7b23ce1686cf3383bb8666f133cf5fa4f6282096 (diff) | |
download | hdf5-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 'java/src/jni/h5lImp.h')
-rw-r--r-- | java/src/jni/h5lImp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/jni/h5lImp.h b/java/src/jni/h5lImp.h index 134ed17..85aff03 100644 --- a/java/src/jni/h5lImp.h +++ b/java/src/jni/h5lImp.h @@ -13,8 +13,8 @@ #include <jni.h> /* Header for class hdf_hdf5lib_H5_H5_H5L */ -#ifndef _Included_hdf_hdf5lib_H5_H5L -#define _Included_hdf_hdf5lib_H5_H5L +#ifndef Included_hdf_hdf5lib_H5_H5L +#define Included_hdf_hdf5lib_H5_H5L #ifdef __cplusplus extern "C" { @@ -170,4 +170,4 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Lunregister(JNIEnv *, jclass, jint) } /* end extern "C" */ #endif /* __cplusplus */ -#endif /* _Included_hdf_hdf5lib_H5_H5L */ +#endif /* Included_hdf_hdf5lib_H5_H5L */ |