Update cmake macros and java arg format

14 files changed, 321 insertions, 111 deletions

diff --git a/MANIFEST b/MANIFEST
index 73858a0..5dd7659 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -103,6 +103,7 @@
 ./bin/batch/knl_ctestP.sl.in.cmake
 ./bin/batch/knl_ctestS.sl.in.cmake
 ./bin/batch/knl_H5detect.sl.in.cmake
+./bin/batch/ctest.qsub.in.cmake
 ./bin/batch/ray_ctestP.lsf.in.cmake
 ./bin/batch/ray_ctestS.lsf.in.cmake
 ./bin/batch/raybsub
@@ -3367,6 +3368,7 @@
 # CMake-specific HPC Scripts
 ./config/cmake/scripts/HPC/sbatch-HDF5options.cmake
 ./config/cmake/scripts/HPC/bsub-HDF5options.cmake
+./config/cmake/scripts/HPC/qsub-HDF5options.cmake
 ./config/cmake/scripts/HPC/raybsub-HDF5options.cmake
 
 # Files generated by autogen
diff --git a/bin/batch/ctest.qsub.in.cmake b/bin/batch/ctest.qsub.in.cmake
new file mode 100644
index 0000000..702fca7
--- /dev/null
+++ b/bin/batch/ctest.qsub.in.cmake
@@ -0,0 +1,21 @@
+#!/bin/bash -l
+if [ $# -gt 0 ]; then
+    SUMMARY_FILE=$1
+fi
+ACCOUNT_ID=@ACCOUNT_ID@
+
+echo "Run parallel test command. Test output will be in build/${SUMMARY_FILE}"
+CTEST_CMD=`which ctest`
+
+#SKIPTESTS <<KEYWORD:script inserts list of skips tests here -- don't remove>>
+
+cd @HDF5_BINARY_DIR@
+if [[ $SUMMARY_FILE == *"ctestS"* ]]; then
+  CMD="${CTEST_CMD} . -E MPI_TEST_ -C Release -j 32 -T test"
+else
+  CMD="${CTEST_CMD} . -R MPI_TEST_ ${SKIP_TESTS} -C Release -T test"
+fi
+
+qsub -t 60 -n 1 -q debug-flat-quad -A ${ACCOUNT_ID} ${CMD} >& ${SUMMARY_FILE}
+
+echo "Done running ctest parallel command."
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index 95c7583..fc49275 100644
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@@ -51,6 +51,8 @@ message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defa
 
 if (WIN32 AND NOT MINGW)
   set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
+else ()
+  set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
 endif ()
 
 # run the test program, capture the stdout/stderr and the result var
@@ -64,6 +66,7 @@ execute_process (
     RESULT_VARIABLE TEST_RESULT
     OUTPUT_FILE ${TEST_OUTPUT}
     ERROR_FILE ${TEST_OUTPUT}.err
+    OUTPUT_VARIABLE TEST_OUT
     ERROR_VARIABLE TEST_ERROR
 )
 
@@ -126,11 +129,22 @@ if (NOT TEST_SKIP_COMPARE)
       file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
     endif ()
 
-    # now compare the output with the reference
-    execute_process (
-        COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
-        RESULT_VARIABLE TEST_RESULT
-    )
+    if (NOT TEST_SORT_COMPARE)
+      # now compare the output with the reference
+      execute_process (
+          COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+          RESULT_VARIABLE TEST_RESULT
+      )
+    else ()
+      file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+      file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+      list (SORT v1)
+      list (SORT v2)
+      if (NOT v1 STREQUAL v2)
+        set(TEST_RESULT 1)
+      endif ()
+    endif ()
+
     if (TEST_RESULT)
       set (TEST_RESULT 0)
       file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index e234057..e1fe85a 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -280,7 +280,11 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
         if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
           execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
         else ()
-          execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
+          if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
+            execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestS.out)
+          else ()
+            execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
+          endif()
         endif ()
         message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
         execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
@@ -299,7 +303,11 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
           if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub")
             execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
           else ()
-            execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+            if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub")
+              execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME} ctestP.out)
+            else ()
+              execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+            endif ()
           endif ()
           message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
           execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 8f0c9fa..2a80277 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -44,7 +44,7 @@ set (CTEST_SOURCE_VERSEXT "-snap1")
 #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
 #CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0
 #MODEL - CDash group name
-#HPC - run alternate configurations for HPC machines; sbatch, bsub, raybsub
+#HPC - run alternate configurations for HPC machines; sbatch, bsub, raybsub, qsub
 #MPI - enable MPI;
 if (DEFINED CTEST_SCRIPT_ARG)
     # transform ctest script arguments of the form
@@ -177,8 +177,8 @@ if (NOT DEFINED HPC)
     endif ()
   endif ()
 else ()
+  set (CTEST_SITE "${SITE_OS_NAME}")
   set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
-  include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
 endif ()
 ###################################################################
 
@@ -203,7 +203,7 @@ endif ()
 #####       Following controls source update                  #####
 #set (LOCAL_UPDATE "TRUE")
 set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")
-set (REPOSITORY_BRANCH "hdf5_1_10_5")
+set (REPOSITORY_BRANCH "hdf5_1_10_6")
 
 #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
 #set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
@@ -228,6 +228,9 @@ if (WIN32)
 else ()
   set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
   include (${CTEST_SCRIPT_DIRECTORY}/HDF5options.cmake)
+  if (DEFINED HPC)
+    include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
+  endif ()
   include (${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake)
   if (APPLE)
     if (EXISTS "${CTEST_BINARY_DIRECTORY}/${BINFILEBASE}-Darwin.dmg")
diff --git a/config/cmake/scripts/HPC/qsub-HDF5options.cmake b/config/cmake/scripts/HPC/qsub-HDF5options.cmake
new file mode 100644
index 0000000..51c3891
--- /dev/null
+++ b/config/cmake/scripts/HPC/qsub-HDF5options.cmake
@@ -0,0 +1,51 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+
+#############################################################################################
+### enable parallel builds
+if (DEFINED MPI)
+  # maximum parallel processor count for build and test       ####
+  set (MAX_PROC_COUNT 8)
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF")
+endif ()
+#############################################################################################
+### options to run test scripts in batch commands
+set (LOCAL_BATCH_SCRIPT_NAME "ctest.qsub")
+set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctest.qsub")
+if (DEFINED KNL)
+  ### some additions and alternatives to cross compile on haswell for knl
+  set (COMPUTENODE_HWCOMPILE_MODULE "craype-mic-knl")
+  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
+endif ()
+set (LOCAL_BATCH_SCRIPT_COMMAND "qsub")
+set (LOCAL_BATCH_TEST "TRUE")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_NAME:STRING=${LOCAL_BATCH_SCRIPT_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_EXECUTABLE:STRING=aprun")
+# Option to suppress writing job statistics; to avoid issues with h5diff comparisons.
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_PREFLAGS:STRING=-q")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=6")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DACCOUNT_ID:STRING=${LOCAL_BATCH_SCRIPT_ARGS}")
+
+#############################################################################################
+#############################################################################################
diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake
index fe8af03..4b58639 100644
--- a/config/cmake_ext_mod/grepTest.cmake
+++ b/config/cmake_ext_mod/grepTest.cmake
@@ -29,14 +29,35 @@ endif ()
 #  message (STATUS "Require TEST_EXPECT to be defined")
 #endif ()
 if (NOT TEST_FILTER)
-  message (STATUS "Require TEST_FILTER to be defined")
+  message (STATUS "Optional TEST_FILTER to be defined")
 endif ()
 if (NOT TEST_REFERENCE)
   message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
 endif ()
 
+if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
+
+if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
 message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
 
+if (TEST_LIBRARY_DIRECTORY)
+  if (WIN32 AND NOT MINGW)
+    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
+  else ()
+    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
+  endif ()
+endif ()
+
+if (TEST_ENV_VAR)
+  set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
+  #message (STATUS "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
+endif ()
+
 # run the test program, capture the stdout/stderr and the result var
 execute_process (
     COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
@@ -49,24 +70,114 @@ execute_process (
 )
 
 message (STATUS "COMMAND Result: ${TEST_RESULT}")
+
 message (STATUS "COMMAND Error: ${TEST_ERROR}")
 
-# now grep the output with the reference
+# remove special output
 file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+string (FIND TEST_STREAM "_pmi_alps" "${TEST_FIND_RESULT}")
+if (TEST_FIND_RESULT GREATER 0)
+  string (REGEX REPLACE "^.*_pmi_alps[^\n]+\n" "" TEST_STREAM "${TEST_STREAM}")
+  file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_STREAM})
+endif ()
 
-# TEST_REFERENCE should always be matched
-string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
-string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_RESULT)
-if (NOT TEST_RESULT)
-  message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+# if the TEST_ERRREF exists grep the error output with the error reference
+if (TEST_ERRREF)
+  # if the .err file exists grep the error output with the error reference before comparing stdout
+  if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+    file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_ERR_STREAM)
+
+    # TEST_ERRREF should always be matched
+    string (REGEX MATCH "${TEST_ERRREF}" TEST_MATCH ${TEST_ERR_STREAM})
+    string (COMPARE EQUAL "${TEST_ERRREF}" "${TEST_MATCH}" TEST_RESULT)
+    if (NOT TEST_RESULT)
+      message (FATAL_ERROR "Failed: The error output of ${TEST_PROGRAM} did not contain ${TEST_ERRREF}")
+    endif ()
+  endif ()
+
+  #always compare output file to reference unless this must be skipped
+  if (NOT TEST_SKIP_COMPARE)
+    if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
+      if (WIN32 AND NOT MINGW)
+        file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+        file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+      endif ()
+      if (NOT TEST_SORT_COMPARE)
+        # now compare the output with the reference
+        execute_process (
+            COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+            RESULT_VARIABLE TEST_RESULT
+        )
+      else ()
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} v1)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} v2)
+        list (SORT v1)
+        list (SORT v2)
+        if (NOT v1 STREQUAL v2)
+          set(TEST_RESULT 1)
+        endif ()
+      endif ()
+
+      if (TEST_RESULT)
+        set (TEST_RESULT 0)
+        file (STRINGS ${TEST_FOLDER}/${TEST_OUTPUT} test_act)
+        list (LENGTH test_act len_act)
+        file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
+        list (LENGTH test_ref len_ref)
+        if (len_act GREATER 0 AND len_ref GREATER 0)
+          math (EXPR _FP_LEN "${len_ref} - 1")
+          foreach (line RANGE 0 ${_FP_LEN})
+            list (GET test_act ${line} str_act)
+            list (GET test_ref ${line} str_ref)
+            if (NOT str_act STREQUAL str_ref)
+              if (str_act)
+                set (TEST_RESULT 1)
+                message (STATUS "line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+              endif ()
+            endif ()
+          endforeach ()
+        else ()
+          if (len_act EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+          endif ()
+          if (len_ref EQUAL 0)
+            message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+          endif ()
+        endif ()
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_RESULT 1)
+        endif ()
+      endif ()
+
+      message (STATUS "COMPARE Result: ${TEST_RESULT}")
+
+      # again, if return value is !=0 scream and shout
+      if (TEST_RESULT)
+        message (FATAL_ERROR "Failed: The output of ${TEST_OUTPUT} did not match ${TEST_REFERENCE}")
+      endif ()
+    endif ()
+  endif ()
+else ()
+  # else grep the output with the reference
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+
+  # TEST_REFERENCE should always be matched
+  string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM})
+  string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_RESULT)
+  if (NOT TEST_RESULT)
+    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}")
+  endif ()
 endif ()
 
-string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
-if (TEST_EXPECT)
-  # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
-  string (LENGTH "${TEST_MATCH}" TEST_RESULT)
-  if (TEST_RESULT)
-    message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+
+if (TEST_FILTER)
+  string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM})
+  if (TEST_EXPECT)
+    # TEST_EXPECT (1) interprets TEST_FILTER as; NOT to match
+    string (LENGTH "${TEST_MATCH}" TEST_RESULT)
+    if (TEST_RESULT)
+      message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
+    endif ()
   endif ()
 endif ()
 
diff --git a/config/gnu-flags b/config/gnu-flags
index 225f072..7df72c7 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -1,4 +1,4 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
 # Copyright by the Board of Trustees of the University of Illinois.
@@ -37,10 +37,10 @@ if test X = "X$cc_flags_set"; then
     cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
     cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
     if test X = "X$cc_vendor" -a X != "X$cc_version"; then
-	cc_vendor=gcc
+    cc_vendor=gcc
     fi
     if test "-" != "$cc_vendor-$cc_version"; then
-	echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
+    echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
     fi
 
     # Some version numbers
@@ -87,7 +87,7 @@ case "$cc_vendor-$cc_version" in
     case "$host_os-$host_cpu" in
         # cygwin needs the "-std=c99" flag removed, so make
         # a specific case for Cygwin without the flag and a default
-        # case to add the flag everywhere else   
+        # case to add the flag everywhere else
         cygwin-*)
             ;;
 
@@ -111,7 +111,7 @@ case "$cc_vendor-$cc_version" in
     # know if they do start showing up.
     #
     # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
-    # warnings that are emitted. If you need it, add it from the 
+    # warnings that are emitted. If you need it, add it from the
     # environment variable at configure time.
     H5_CFLAGS="$H5_CFLAGS $arch -pedantic -Wall -Wextra -Wbad-function-cast -Wc++-compat -Wcast-align"
     H5_CFLAGS="$H5_CFLAGS -Wcast-qual -Wconversion -Wdeclaration-after-statement -Wdisabled-optimization -Wfloat-equal"
@@ -126,7 +126,7 @@ case "$cc_vendor-$cc_version" in
       gcc-4.*)
         PROD_CFLAGS=
         ;;
-      gcc-[56].*)
+      gcc-[56789].*)
         PROD_CFLAGS="-fstdarg-opt"
         ;;
       *)
@@ -140,7 +140,7 @@ case "$cc_vendor-$cc_version" in
     # NDEBUG is handled explicitly by the configure script
     # -g is handled by the symbols flags
     case "$cc_vendor-$cc_version" in
-      gcc-[56].*)
+      gcc-[56789].*)
         DEBUG_CFLAGS="-ftrapv -fno-common"
         ;;
       *)
@@ -165,7 +165,7 @@ case "$cc_vendor-$cc_version" in
         HIGH_OPT_CFLAGS="-O3"
         DEBUG_OPT_CFLAGS=
         ;;
-      gcc-[56].*)
+      gcc-[56789].*)
         HIGH_OPT_CFLAGS="-O3"
         DEBUG_OPT_CFLAGS="-Og"
         ;;
@@ -190,7 +190,7 @@ case "$cc_vendor-$cc_version" in
 # When the gcc 7.x release is out, we should check for additional flags to
 # include and break it out into it's own section, like the other versions
 # below. -QAK
-  gcc-6*)
+  gcc-[6789].*)
     # Append warning flags that only gcc 4.2+ knows about
     # (none, or incorporated in -Wall / -Wextra now)
 
diff --git a/java/src/jni/h5Imp.c b/java/src/jni/h5Imp.c
index 99c91fd..f0dd691 100644
--- a/java/src/jni/h5Imp.c
+++ b/java/src/jni/h5Imp.c
@@ -127,7 +127,7 @@ done:
     if (libversionArray)
         UNPIN_INT_ARRAY(ENVONLY, libversion, libversionArray, (status < 0) ? JNI_ABORT : 0);
 
-	return (jint)status;
+    return (jint)status;
 } /* end Java_hdf_hdf5lib_H5_H5get_1libversion */
 
 /*
diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c
index 4ab00df..937323e 100644
--- a/java/src/jni/h5eImp.c
+++ b/java/src/jni/h5eImp.c
@@ -62,11 +62,11 @@ static herr_t H5E_walk_cb(int nindx, const H5E_error2_t *info, void *cb_data);
  */
 JNIEXPORT jboolean JNICALL
 Java_hdf_hdf5lib_H5_H5Eauto_1is_1v2
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
     unsigned int is_stack = 0;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eauto_is_v2: invalid stack ID");
@@ -85,14 +85,14 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Eregister_1class
-    (JNIEnv *env, jclass cls, jstring cls_name, jstring lib_name, jstring version)
+    (JNIEnv *env, jclass clss, jstring cls_name, jstring lib_name, jstring version)
 {
     const char* the_cls_name = NULL;
     const char* the_lib_name = NULL;
     const char* the_version = NULL;
     hid_t       ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == cls_name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Eregister_class: class name is NULL");
@@ -126,9 +126,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eunregister_1class
-    (JNIEnv *env, jclass cls, jlong cls_id)
+    (JNIEnv *env, jclass clss, jlong cls_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (cls_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eunregister_class: invalid error class ID");
@@ -147,9 +147,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eclose_1msg
-    (JNIEnv *env, jclass cls, jlong err_id)
+    (JNIEnv *env, jclass clss, jlong err_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (err_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eclose_msg: invalid error message ID");
@@ -168,13 +168,13 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Ecreate_1msg
-    (JNIEnv *env, jclass cls, jlong err_id, jint msg_type, jstring err_msg)
+    (JNIEnv *env, jclass clss, jlong err_id, jint msg_type, jstring err_msg)
 {
     H5E_type_t  error_msg_type = (H5E_type_t)msg_type;
     const char *the_err_msg = NULL;
     hid_t       ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (err_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Ecreate_msg: invalid error class ID");
@@ -200,11 +200,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Ecreate_1stack
-    (JNIEnv *env, jclass cls)
+    (JNIEnv *env, jclass clss)
 {
     hid_t ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Ecreate_stack()) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -220,11 +220,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1current_1stack
-    (JNIEnv *env, jclass cls)
+    (JNIEnv *env, jclass clss)
 {
     hid_t ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Eget_current_stack()) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -240,9 +240,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eclose_1stack
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eclose_stack: invalid error stack ID");
@@ -261,11 +261,11 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eprint2
-    (JNIEnv *env, jclass cls, jlong stk_id, jobject stream_obj)
+    (JNIEnv *env, jclass clss, jlong stk_id, jobject stream_obj)
 {
     herr_t ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eprint2: invalid error stack ID");
@@ -290,13 +290,13 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1class_1name
-    (JNIEnv *env, jclass cls, jlong cls_id)
+    (JNIEnv *env, jclass clss, jlong cls_id)
 {
     jstring  str = NULL;
     ssize_t  buf_size;
     char    *namePtr = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (cls_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_class_name: invalid error class ID");
@@ -332,9 +332,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eset_1current_1stack
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eset_current_stack: invalid error stack ID");
@@ -353,9 +353,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Epop
-    (JNIEnv *env, jclass cls, jlong stk_id, jlong count)
+    (JNIEnv *env, jclass clss, jlong stk_id, jlong count)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Epop: invalid error stack ID");
@@ -374,7 +374,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Epush2
-    (JNIEnv *env, jclass cls, jlong stk_id, jstring filename, jstring funcname,
+    (JNIEnv *env, jclass clss, jlong stk_id, jstring filename, jstring funcname,
         jint linenumber, jlong class_id, jlong major_id, jlong minor_id, jstring err_desc)
 {
     const char *fName = NULL;
@@ -382,7 +382,7 @@ Java_hdf_hdf5lib_H5_H5Epush2
     const char *errMsg = NULL;
     herr_t      ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Epush2: invalid error stack ID");
@@ -423,9 +423,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eclear2
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eclear2: invalid error stack ID");
@@ -444,7 +444,7 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1msg
-    (JNIEnv *env, jclass cls, jlong msg_id, jintArray error_msg_type_list)
+    (JNIEnv *env, jclass clss, jlong msg_id, jintArray error_msg_type_list)
 {
     H5E_type_t  error_msg_type;
     jstring     str = NULL;
@@ -452,7 +452,7 @@ Java_hdf_hdf5lib_H5_H5Eget_1msg
     jint       *theArray = NULL;
     char       *namePtr = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (msg_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_msg: invalid error message ID");
@@ -496,11 +496,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1num
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
     ssize_t ret_val = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_num: invalid error stack ID");
@@ -587,11 +587,11 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Ewalk2
-    (JNIEnv *env, jclass cls, jlong stk_id, jlong direction, jobject callback_op, jobject op_data)
+    (JNIEnv *env, jclass clss, jlong stk_id, jlong direction, jobject callback_op, jobject op_data)
 {
     cb_wrapper wrapper = { callback_op, op_data };
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     ENVPTR->GetJavaVM(ENVONLY, &jvm);
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 52b0970..115e8f4 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -118,13 +118,13 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1name
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
     jstring  str = NULL;
     ssize_t  buf_size;
     char    *namePtr = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     /* Get the length of the name */
     if ((buf_size = H5Fget_name((hid_t)file_id, NULL, 0)) < 0)
@@ -225,11 +225,11 @@ done:
  */
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1intent
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
     unsigned intent = 0;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fget_intent((hid_t)file_id, &intent) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -323,11 +323,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1freespace
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
     hssize_t ret_val = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Fget_freespace((hid_t)file_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -363,7 +363,7 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids
-    (JNIEnv *env, jclass cls, jlong file_id, jint types, jlong maxObjs,
+    (JNIEnv *env, jclass clss, jlong file_id, jint types, jlong maxObjs,
           jlongArray obj_id_list)
 {
     jboolean  isCopy;
@@ -373,7 +373,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids
     jlong    *obj_id_listP = NULL;
     hid_t    *id_list = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == obj_id_list)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fget_obj_ids: obj_id_list is NULL");
@@ -411,11 +411,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1obj_1count
-    (JNIEnv *env, jclass cls, jlong file_id, jint types)
+    (JNIEnv *env, jclass clss, jlong file_id, jint types)
 {
     ssize_t ret_val = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Fget_obj_count((hid_t)file_id, (unsigned int)types)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -451,11 +451,11 @@ done:
  */
 JNIEXPORT jdouble JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1mdc_1hit_1rate
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
     double rate = 0.0;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fget_mdc_hit_rate((hid_t)file_id, &rate) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -471,7 +471,7 @@ done:
  */
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size
-    (JNIEnv *env, jclass cls, jlong file_id, jlongArray metadata_cache)
+    (JNIEnv *env, jclass clss, jlong file_id, jlongArray metadata_cache)
 {
     jboolean  isCopy;
     size_t    max_size = 0, min_clean_size = 0, cur_size = 0;
@@ -479,7 +479,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size
     jsize     size = 0;
     int       cur_num_entries = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == metadata_cache)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fget_mdc_size: metadata cache array is NULL");
@@ -557,9 +557,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Freset_1mdc_1hit_1rate_1stats
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Freset_mdc_hit_rate_stats((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -575,9 +575,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fclear_elink_file_cache((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -593,9 +593,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fstart_1swmr_1write
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fstart_swmr_write((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -611,9 +611,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fstart_mdc_logging((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -629,9 +629,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fstop_mdc_logging((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -647,7 +647,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
-    (JNIEnv *env, jclass cls, jlong file_id, jbooleanArray mdc_logging_status)
+    (JNIEnv *env, jclass clss, jlong file_id, jbooleanArray mdc_logging_status)
 {
     jboolean  *mdc_logging_status_ptr = NULL;
     jboolean   isCopy;
@@ -655,7 +655,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
     hbool_t    is_currently_logging;
     jsize      size;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == mdc_logging_status)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fget_mdc_logging_status: mdc_logging_status is NULL");
diff --git a/java/src/jni/h5gImp.c b/java/src/jni/h5gImp.c
index b579f31..79b1b65 100644
--- a/java/src/jni/h5gImp.c
+++ b/java/src/jni/h5gImp.c
@@ -148,11 +148,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5__1H5Gcreate_1anon
-    (JNIEnv *env, jclass cls, jlong loc_id, jlong gcpl_id, jlong gapl_id)
+    (JNIEnv *env, jclass clss, jlong loc_id, jlong gcpl_id, jlong gapl_id)
 {
     hid_t group_id = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((group_id = H5Gcreate_anon((hid_t)loc_id, (hid_t)gcpl_id, (hid_t)gapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -198,11 +198,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1create_1plist
-    (JNIEnv *env, jclass cls, jlong loc_id)
+    (JNIEnv *env, jclass clss, jlong loc_id)
 {
     hid_t plist_id = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((plist_id = H5Gget_create_plist((hid_t)loc_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -218,12 +218,12 @@ done:
  */
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1info
-    (JNIEnv *env, jclass cls, jlong loc_id)
+    (JNIEnv *env, jclass clss, jlong loc_id)
 {
     H5G_info_t group_info;
     jobject    obj = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Gget_info((hid_t)loc_id, &group_info) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -242,14 +242,14 @@ done:
  */
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1name
-    (JNIEnv *env, jclass cls, jlong loc_id, jstring name, jlong lapl_id)
+    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong lapl_id)
 {
     H5G_info_t  group_info;
     const char *grpName = NULL;
     jobject     obj = NULL;
     herr_t      ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Gget_info_by_name: group name is NULL");
@@ -278,7 +278,7 @@ done:
  */
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx
-    (JNIEnv *env, jclass cls, jlong loc_id, jstring name, jint index_type,
+    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint index_type,
           jint order, jlong n, jlong lapl_id)
 {
     H5_iter_order_t  corder = (H5_iter_order_t)order;
@@ -288,7 +288,7 @@ Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx
     jobject          obj = NULL;
     herr_t           ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Gget_info_by_idx: group name is NULL");
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index 087cda8..3c675b8 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -1129,14 +1129,14 @@ done:
  */
 JNIEXPORT jbyteArray JNICALL
 Java_hdf_hdf5lib_H5_H5Sencode
-    (JNIEnv *env, jclass cls, jlong obj_id)
+    (JNIEnv *env, jclass clss, jlong obj_id)
 {
     unsigned char *bufPtr = NULL;
     size_t         buf_size = 0;
     herr_t         status = FAIL;
     jbyteArray     returnedArray = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (obj_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sencode: invalid object ID");
@@ -1173,13 +1173,13 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Sdecode
-    (JNIEnv *env, jclass cls, jbyteArray buf)
+    (JNIEnv *env, jclass clss, jbyteArray buf)
 {
     jboolean  isCopy;
     jbyte    *bufP = NULL;
     hid_t     sid = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == buf)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Sdecode: buffer is NULL");
@@ -1203,11 +1203,11 @@ done:
  */
 JNIEXPORT jboolean JNICALL
 Java_hdf_hdf5lib_H5_H5Sis_1regular_1hyperslab
-    (JNIEnv *env, jclass cls, jlong obj_id)
+    (JNIEnv *env, jclass clss, jlong obj_id)
 {
     htri_t bval = JNI_FALSE;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((bval = H5Sis_regular_hyperslab((hid_t)obj_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 5454dce..af83caa 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -3453,7 +3453,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5export_1dataset
-    (JNIEnv *env, jclass cls, jstring file_export_name, jstring file_name, jstring object_path, jint binary_order)
+    (JNIEnv *env, jclass clss, jstring file_export_name, jstring file_name, jstring object_path, jint binary_order)
 {
     const char *file_export = NULL;
     const char *object_name = NULL;
@@ -3464,7 +3464,7 @@ Java_hdf_hdf5lib_H5_H5export_1dataset
     hid_t       dataset_id = H5I_INVALID_HID;
     FILE       *stream = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == file_export_name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5export_dataset: file_export_name is NULL");