diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
| commit | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (patch) | |
| tree | 3b7ce8804ae917fd71e995a39b4ccb08d2aa7169 /java/src/jni/h5tImp.h | |
| parent | 156baee37112996291f9ff07760be047d0e03c76 (diff) | |
| parent | 71b817038d8cd82163cf71119873b2ba65a2c81b (diff) | |
| download | hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.zip hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.gz hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.bz2 | |
merge and fix conflicts
Diffstat (limited to 'java/src/jni/h5tImp.h')
| -rw-r--r-- | java/src/jni/h5tImp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/jni/h5tImp.h b/java/src/jni/h5tImp.h index a63969b..78e4561 100644 --- a/java/src/jni/h5tImp.h +++ b/java/src/jni/h5tImp.h @@ -402,9 +402,9 @@ Java_hdf_hdf5lib_H5_H5Tpack /* * Class: hdf_hdf5lib_H5 * Method: H5Treclaim - * Signature: (JJJ[B)I + * Signature: (JJJ[B)V */ -JNIEXPORT jint JNICALL +JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Treclaim (JNIEnv*, jclass, jlong, jlong, jlong, jbyteArray); |