summaryrefslogtreecommitdiffstats
path: root/java/src/jni
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-09-17 19:41:00 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-09-17 19:41:00 (GMT)
commit3fed3735dba9922e9b0ced19e995039bebd9c5d1 (patch)
tree8c4e2436701e701848c263d5b3a8702f17ab7ce8 /java/src/jni
parentaad17ae135005ca65bac4647d69833c9e5e8fd3e (diff)
downloadhdf5-3fed3735dba9922e9b0ced19e995039bebd9c5d1.zip
hdf5-3fed3735dba9922e9b0ced19e995039bebd9c5d1.tar.gz
hdf5-3fed3735dba9922e9b0ced19e995039bebd9c5d1.tar.bz2
HDFFV-10903 merge updated changes
Diffstat (limited to 'java/src/jni')
-rw-r--r--java/src/jni/h5Constants.c16
-rw-r--r--java/src/jni/h5fImp.c4
2 files changed, 14 insertions, 6 deletions
diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index f1bd951..f9b0cfd 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -438,7 +438,13 @@ Java_hdf_hdf5lib_HDF5Constants_H5FD_1DIRECT(JNIEnv *env, jclass cls) {
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_HDF5Constants_H5FD_1FAMILY(JNIEnv *env, jclass cls) { return H5FD_FAMILY; }
JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1HDFS(JNIEnv *env, jclass cls) { return H5FD_HDFS; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1HDFS(JNIEnv *env, jclass cls) {
+#ifdef H5_HAVE_LIBHDFS
+ return H5FD_HDFS;
+#else
+ return -1;
+#endif
+}
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG(JNIEnv *env, jclass cls) { return H5FD_LOG; }
JNIEXPORT jlong JNICALL
@@ -448,7 +454,13 @@ Java_hdf_hdf5lib_HDF5Constants_H5FD_1MULTI(JNIEnv *env, jclass cls) { return H5F
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_HDF5Constants_H5FD_1SEC2(JNIEnv *env, jclass cls) { return H5FD_SEC2; }
JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1ROS3(JNIEnv *env, jclass cls) { return H5FD_ROS3; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1ROS3(JNIEnv *env, jclass cls) {
+#ifdef H5_HAVE_ROS3_VFD
+ return H5FD_ROS3;
+#else
+ return -1;
+#endif
+}
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_HDF5Constants_H5FD_1STDIO(JNIEnv *env, jclass cls) { return H5FD_STDIO; }
JNIEXPORT jlong JNICALL
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 2924d8f..115e8f4 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -161,10 +161,6 @@ Java_hdf_hdf5lib_H5_H5Fis_1hdf5
UNUSED(clss);
-#ifdef H5_NO_DEPRECATED_SYMBOLS
- H5_UNIMPLEMENTED(ENVONLY, "H5Fis_hdf5: not implemented");
-#endif
-
if (NULL == name)
H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fis_hdf5: file name is NULL");