diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-09-19 19:15:54 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-09-19 19:15:54 (GMT) |
commit | 80b371f32eb8beb66630e770db94af2f0e3827fa (patch) | |
tree | ad0c507d8b450cdac0eea2b74fdde6ee91be00a7 /java | |
parent | 4d4a88a9f3775d1c6be820208a2699ae38d586b4 (diff) | |
parent | 8cddc96f73e8f90f67792405f5142b419e9061d7 (diff) | |
download | hdf5-80b371f32eb8beb66630e770db94af2f0e3827fa.zip hdf5-80b371f32eb8beb66630e770db94af2f0e3827fa.tar.gz hdf5-80b371f32eb8beb66630e770db94af2f0e3827fa.tar.bz2 |
Merge pull request #1926 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '8cddc96f73e8f90f67792405f5142b419e9061d7':
Change unused variable to generic form
Whitespace cleanup
Add missing HD prefix
HDFFV-10740 - skip copying dirs in for loops
Correct HDF5 options to tristate values.
HDFFV-10905 fix test scripts for no zlib
HDFFV-10903 - fix VFD constants in JNI
Diffstat (limited to 'java')
-rw-r--r-- | java/CMakeLists.txt | 2 | ||||
-rw-r--r-- | java/src/jni/h5Constants.c | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 528b24f..56e1695 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -16,7 +16,7 @@ message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}") if (WIN32) - set (HDF_JRE_DIRECTORY "C:/Program Files/Java/jre8") + set (HDF_JRE_DIRECTORY "C:/Program Files/Java/jre") else () set (HDF_JRE_DIRECTORY "/usr/lib/jvm/jre") endif () diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c index ac55a13..9f52b3c 100644 --- a/java/src/jni/h5Constants.c +++ b/java/src/jni/h5Constants.c @@ -453,7 +453,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 @@ -463,7 +469,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 |